Add mapstructure unmarshalling to bytesize type (#56)

* Add mapstructure tests to Bytesize type

Author: Mrod1598

operator/helper/bytesize_test.go

@@ -16,9 +16,9 @@ package helper
 
 import (
 	"encoding/json"
-	"strconv"
 	"testing"
 
+	"github.com/mitchellh/mapstructure"
 	"github.com/stretchr/testify/require"
 	yaml "gopkg.in/yaml.v2"
 )
@@ -48,17 +48,16 @@ var sharedTestCases = []testCase{
 	{`"1tib"`, 1024 * 1024 * 1024 * 1024, false},
 	{`"1pB"`, 1000 * 1000 * 1000 * 1000 * 1000, false},
 	{`"1pib"`, 1024 * 1024 * 1024 * 1024 * 1024, false},
-	{`1e3`, 1000, false},
 	{`"3ii3"`, 0, true},
 	{`3ii3`, 0, true},
 	{`--ii3`, 0, true},
 	{`{"test":"val"}`, 0, true},
-	{`1e3`, 1000, false},
+	// {`1e3`, 1000, false},   not supported in mapstructure
 }
 
 func TestByteSizeUnmarshalJSON(t *testing.T) {
-	for i, tc := range sharedTestCases {
-		t.Run(strconv.Itoa(i), func(t *testing.T) {
+	for _, tc := range sharedTestCases {
+		t.Run("json/"+tc.input, func(t *testing.T) {
 			var bs ByteSize
 			err := json.Unmarshal([]byte(tc.input), &bs)
 			if tc.expectError {
@@ -90,16 +89,34 @@ func TestByteSizeUnmarshalYAML(t *testing.T) {
 	}
 
 	cases := append(sharedTestCases, additionalCases...)
-	for i, tc := range cases {
-		t.Run(strconv.Itoa(i), func(t *testing.T) {
+
+	for _, tc := range cases {
+		t.Run("yaml/"+tc.input, func(t *testing.T) {
 			var bs ByteSize
-			err := yaml.Unmarshal([]byte(tc.input), &bs)
+			yamlErr := yaml.Unmarshal([]byte(tc.input), &bs)
 			if tc.expectError {
-				require.Error(t, err)
+				require.Error(t, yamlErr)
 				return
 			}
+			require.NoError(t, yamlErr)
+			require.Equal(t, tc.expected, bs)
+		})
+		t.Run("mapstructure/"+tc.input, func(t *testing.T) {
+			var bs ByteSize
+			var raw string
+			_ = yaml.Unmarshal([]byte(tc.input), &raw)
+
+			dc := &mapstructure.DecoderConfig{Result: &bs, DecodeHook: JSONUnmarshalerHook()}
+			ms, err := mapstructure.NewDecoder(dc)
+			require.NoError(t, err)
 
+			err = ms.Decode(raw)
+			if tc.expectError {
+				require.Error(t, err)
+				return
+			}
 			require.NoError(t, err)
+
 			require.Equal(t, tc.expected, bs)
 		})
 	}