From 1d999712e6902414bbac30db8a5603758c5c539c Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Thu, 29 Sep 2022 21:50:43 +0100 Subject: [feature] update config types to use bytesize.Size (#828) * update config size types to use bytesize.Size * submit unchecked-out file ... :facepalm: * fix bytesize config var decoding * bump bytesize version * update kim's libraries in readme * update envparse.sh to output more useful errors * improve envparse.sh * remove reliance on jq * instead, use uint64 for bytesize flag types * remove redundant type * fix viper unmarshaling * Update envparsing.sh * fix envparsing test Signed-off-by: kim Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com> --- internal/config/state.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'internal/config/state.go') diff --git a/internal/config/state.go b/internal/config/state.go index 1364fb84e..17fd31e2a 100644 --- a/internal/config/state.go +++ b/internal/config/state.go @@ -133,6 +133,12 @@ func (st *ConfigState) reloadFromViper() { if err := st.viper.Unmarshal(&st.config, func(c *mapstructure.DecoderConfig) { c.TagName = "name" c.ZeroFields = true // empty the config struct before we marshal values into it + + oldhook := c.DecodeHook + c.DecodeHook = mapstructure.ComposeDecodeHookFunc( + mapstructure.TextUnmarshallerHookFunc(), + oldhook, + ) }); err != nil { panic(err) } -- cgit v1.2.3