chore: reduce yaml dependencies footprint (#38)

## Description Noticed that k8s suddenly appeared in my dependencies. Since this only adds yaml2json features it's not necessary here. ## Changes - Replace sigs yaml deps by go-yaml ## Checklist - [x] I have read the **CONTRIBUTING.md** document. - [x] My code follows the code style of this project. - [x] I have added tests to cover my changes. - [x] All new and existing tests passed. - [x] I have updated the documentation accordingly. - [ ] This change requires a change to the documentation on the website. ## Additional Information Follow-up to #36
go-sprout · Jun 16, 2024 · 4ea0e87 · 4ea0e87
1 parent c8121eb
commit 4ea0e87
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/encoding_functions.go b/encoding_functions.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"sigs.k8s.io/yaml"
+	"gopkg.in/yaml.v3"
 )
 
 // Base64Encode encodes a string into its Base64 representation.
@@ -181,7 +181,7 @@ func (fh *FunctionHandler) ToRawJson(v any) string {
 //
 //	{{ "name: John Doe\nage: 30" | fromYAML }} // Output: map[name:John Doe age:30]
 func (fh *FunctionHandler) FromYAML(str string) any {
-	var m = make(map[string]any)
+	m := make(map[string]any)
 
 	if err := yaml.Unmarshal([]byte(str), &m); err != nil {
 		return nil

diff --git a/encoding_functions_test.go b/encoding_functions_test.go
@@ -3,7 +3,7 @@ package sprout
 import "testing"
 
 func TestBase64Encode(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestWithoutInput", `{{ "" | base64Encode }}`, "", nil},
 		{"TestHelloWorldInput", `{{ "Hello World" | base64Encode }}`, "SGVsbG8gV29ybGQ=", nil},
 		{"TestFromVariableInput", `{{ .V | base64Encode }}`, "SGVsbG8gV29ybGQ=", map[string]any{"V": "Hello World"}},
@@ -13,7 +13,7 @@ func TestBase64Encode(t *testing.T) {
 }
 
 func TestBase64Decode(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestWithoutInput", `{{ "" | base64Decode }}`, "", nil},
 		{"TestHelloWorldInput", `{{ "SGVsbG8gV29ybGQ=" | base64Decode }}`, "Hello World", nil},
 		{"TestFromVariableInput", `{{ .V | base64Decode }}`, "Hello World", map[string]any{"V": "SGVsbG8gV29ybGQ="}},
@@ -24,7 +24,7 @@ func TestBase64Decode(t *testing.T) {
 }
 
 func TestBase32Encode(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestWithoutInput", `{{ "" | base32Encode }}`, "", nil},
 		{"TestHelloWorldInput", `{{ "Hello World" | base32Encode }}`, "JBSWY3DPEBLW64TMMQ======", nil},
 		{"TestFromVariableInput", `{{ .V | base32Encode }}`, "JBSWY3DPEBLW64TMMQ======", map[string]any{"V": "Hello World"}},
@@ -34,7 +34,7 @@ func TestBase32Encode(t *testing.T) {
 }
 
 func TestBase32Decode(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestWithoutInput", `{{ "" | base32Decode }}`, "", nil},
 		{"TestHelloWorldInput", `{{ "JBSWY3DPEBLW64TMMQ======" | base32Decode }}`, "Hello World", nil},
 		{"TestFromVariableInput", `{{ .V | base32Decode }}`, "Hello World", map[string]any{"V": "JBSWY3DPEBLW64TMMQ======"}},
@@ -45,7 +45,7 @@ func TestBase32Decode(t *testing.T) {
 }
 
 func TestFromJson(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestEmptyInput", `{{ "" | fromJson }}`, "<no value>", nil},
 		{"TestVariableInput", `{{ .V | fromJson }}`, "map[foo:55]", map[string]any{"V": `{"foo": 55}`}},
 		{"TestAccessField", `{{ (.V | fromJson).foo }}`, "55", map[string]any{"V": `{"foo": 55}`}},
@@ -55,7 +55,7 @@ func TestFromJson(t *testing.T) {
 }
 
 func TestToJson(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestEmptyInput", `{{ "" | toJson }}`, "\"\"", nil},
 		{"TestVariableInput", `{{ .V | toJson }}`, "{\"bar\":\"baz\",\"foo\":55}", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}},
 	}
@@ -64,7 +64,7 @@ func TestToJson(t *testing.T) {
 }
 
 func TestToPrettyJson(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestEmptyInput", `{{ "" | toPrettyJson }}`, "\"\"", nil},
 		{"TestVariableInput", `{{ .V | toPrettyJson }}`, "{\n  \"bar\": \"baz\",\n  \"foo\": 55\n}", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}},
 	}
@@ -73,7 +73,7 @@ func TestToPrettyJson(t *testing.T) {
 }
 
 func TestToRawJson(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestEmptyInput", `{{ "" | toRawJson }}`, "\"\"", nil},
 		{"TestVariableInput", `{{ .V | toRawJson }}`, "{\"bar\":\"baz\",\"foo\":55}", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}},
 	}
@@ -82,7 +82,7 @@ func TestToRawJson(t *testing.T) {
 }
 
 func TestFromYAML(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestEmptyInput", `{{ "" | fromYaml }}`, "map[]", nil},
 		{"TestVariableInput", `{{ .V | fromYaml }}`, "map[bar:map[baz:1] foo:55]", map[string]any{"V": "foo: 55\nbar:\n  baz: 1\n"}},
 		{"TestAccessField", `{{ (.V | fromYaml).foo }}`, "55", map[string]any{"V": "foo: 55"}},
@@ -93,7 +93,7 @@ func TestFromYAML(t *testing.T) {
 }
 
 func TestToYAML(t *testing.T) {
-	var tests = testCases{
+	tests := testCases{
 		{"TestEmptyInput", `{{ "" | toYaml }}`, "\"\"", nil},
 		{"TestVariableInput", `{{ .V | toYaml }}`, "bar: baz\nfoo: 55", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}},
 	}
@@ -102,7 +102,7 @@ func TestToYAML(t *testing.T) {
 }
 
 func TestMustFromJson(t *testing.T) {
-	var tests = mustTestCases{
+	tests := mustTestCases{
 		{testCase{"TestEmptyInput", `{{ "" | mustFromJson }}`, "", nil}, "unexpected end"},
 		{testCase{"TestVariableInput", `{{ .V | mustFromJson }}`, "map[foo:55]", map[string]any{"V": `{"foo": 55}`}}, ""},
 		{testCase{"TestInvalidInput", `{{ .V | mustFromJson }}`, "", map[string]any{"V": "{3}"}}, "invalid character '3'"},
@@ -112,7 +112,7 @@ func TestMustFromJson(t *testing.T) {
 }
 
 func TestMustToJson(t *testing.T) {
-	var tests = mustTestCases{
+	tests := mustTestCases{
 		{testCase{"TestEmptyInput", `{{ "" | mustToJson }}`, "\"\"", nil}, ""},
 		{testCase{"TestVariableInput", `{{ .V | mustToJson }}`, "{\"bar\":\"baz\",\"foo\":55}", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}}, ""},
 		{testCase{"TestInvalidInput", `{{ .V | mustToJson }}`, "", map[string]any{"V": make(chan int)}}, "json: unsupported type: chan int"},
@@ -122,7 +122,7 @@ func TestMustToJson(t *testing.T) {
 }
 
 func TestMustToPrettyJson(t *testing.T) {
-	var tests = mustTestCases{
+	tests := mustTestCases{
 		{testCase{"TestEmptyInput", `{{ "" | mustToPrettyJson }}`, "\"\"", nil}, ""},
 		{testCase{"TestVariableInput", `{{ .V | mustToPrettyJson }}`, "{\n  \"bar\": \"baz\",\n  \"foo\": 55\n}", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}}, ""},
 		{testCase{"TestInvalidInput", `{{ .V | mustToPrettyJson }}`, "", map[string]any{"V": make(chan int)}}, "json: unsupported type: chan int"},
@@ -132,7 +132,7 @@ func TestMustToPrettyJson(t *testing.T) {
 }
 
 func TestMustToRawJson(t *testing.T) {
-	var tests = mustTestCases{
+	tests := mustTestCases{
 		{testCase{"TestEmptyInput", `{{ "" | mustToRawJson }}`, "\"\"", nil}, ""},
 		{testCase{"TestVariableInput", `{{ .V | mustToRawJson }}`, "{\"bar\":\"baz\",\"foo\":55}", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}}, ""},
 		{testCase{"TestInvalidInput", `{{ .V | mustToRawJson }}`, "", map[string]any{"V": make(chan int)}}, "json: unsupported type: chan int"},
@@ -142,8 +142,8 @@ func TestMustToRawJson(t *testing.T) {
 }
 
 func TestMustFromYAML(t *testing.T) {
-	var tests = mustTestCases{
-		{testCase{"TestEmptyInput", `{{ "foo: :: baz" | mustFromYaml }}`, "", nil}, "error converting YAML to JSON"},
+	tests := mustTestCases{
+		{testCase{"TestEmptyInput", `{{ "foo: :: baz" | mustFromYaml }}`, "", nil}, "yaml: mapping values are not allowed in this context"},
 		{testCase{"TestVariableInput", `{{ .V | mustFromYaml }}`, "map[bar:map[baz:1] foo:55]", map[string]any{"V": "foo: 55\nbar:\n  baz: 1\n"}}, ""},
 		{testCase{"TestInvalidInput", `{{ .V | mustFromYaml }}`, "", map[string]any{"V": ":"}}, "did not find expected key"},
 	}
@@ -152,10 +152,10 @@ func TestMustFromYAML(t *testing.T) {
 }
 
 func TestMustToYAML(t *testing.T) {
-	var tests = mustTestCases{
+	tests := mustTestCases{
 		{testCase{"TestEmptyInput", `{{ "" | mustToYaml }}`, "\"\"", nil}, ""},
 		{testCase{"TestVariableInput", `{{ .V | mustToYaml }}`, "bar: baz\nfoo: 55", map[string]any{"V": map[string]any{"foo": 55, "bar": "baz"}}}, ""},
-		{testCase{"TestInvalidInput", `{{ .V | mustToYaml }}`, "", map[string]any{"V": make(chan int)}}, "json: unsupported type: chan int"},
+		{testCase{"TestInvalidInput", `{{ .V | mustToYaml }}`, "", map[string]any{"V": make(chan int)}}, "cannot marshal type: chan int"},
 	}
 
 	runMustTestCases(t, tests)

diff --git a/go.mod b/go.mod
@@ -11,12 +11,11 @@ require (
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.21.0
 	golang.org/x/text v0.14.0
-	sigs.k8s.io/yaml v1.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -34,5 +34,3 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=