Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: reduce yaml dependencies footprint #38

Merged
merged 2 commits into from
Jun 16, 2024
Merged

chore: reduce yaml dependencies footprint #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
569f4a4
Trim dependencies
andig Jun 10, 2024
f29746d
Fix tests
andig Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions encoding_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"encoding/json"
"strings"

"sigs.k8s.io/yaml"
"gopkg.in/yaml.v3"
)

// Base64Encode encodes a string into its Base64 representation.
Expand Down Expand Up @@ -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
Expand Down
36 changes: 18 additions & 18 deletions encoding_functions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}},
Expand All @@ -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="}},
Expand All @@ -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"}},
Expand All @@ -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======"}},
Expand All @@ -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}`}},
Expand All @@ -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"}}},
}
Expand All @@ -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"}}},
}
Expand All @@ -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"}}},
}
Expand All @@ -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"}},
Expand All @@ -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"}}},
}
Expand All @@ -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'"},
Expand All @@ -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"},
Expand All @@ -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"},
Expand All @@ -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"},
Expand All @@ -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"},
}
Expand All @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Loading