From 6ce751eafef9184d730b6d299cc06e9f94e2e7b7 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Tue, 19 Dec 2023 22:15:13 +0100 Subject: [PATCH] chore: update mapstructure Signed-off-by: Mark Sagi-Kazar --- README.md | 2 +- go.mod | 3 ++- go.sum | 2 ++ viper.go | 2 +- viper_test.go | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b96180b..b9fdd1d 100644 --- a/README.md +++ b/README.md @@ -802,7 +802,7 @@ if err != nil { } ``` -Viper uses [github.com/mitchellh/mapstructure](https://github.com/mitchellh/mapstructure) under the hood for unmarshaling values which uses `mapstructure` tags by default. +Viper uses [github.com/go-viper/mapstructure](https://github.com/go-viper/mapstructure) under the hood for unmarshaling values which uses `mapstructure` tags by default. ### Decoding custom formats diff --git a/go.mod b/go.mod index e1e89ab..10e7db9 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/fsnotify/fsnotify v1.7.0 + github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 github.com/hashicorp/hcl v1.0.0 github.com/magiconair/properties v1.8.7 - github.com/mitchellh/mapstructure v1.5.0 github.com/pelletier/go-toml/v2 v2.1.1 github.com/sagikazarmark/crypt v0.17.0 github.com/sagikazarmark/locafero v0.4.0 @@ -49,6 +49,7 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/nats-io/nats.go v1.31.0 // indirect diff --git a/go.sum b/go.sum index 9dae468..24441f5 100644 --- a/go.sum +++ b/go.sum @@ -58,6 +58,8 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= +github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= diff --git a/viper.go b/viper.go index 20eb4da..e18ddde 100644 --- a/viper.go +++ b/viper.go @@ -34,7 +34,7 @@ import ( "time" "github.com/fsnotify/fsnotify" - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" slog "github.com/sagikazarmark/slog-shim" "github.com/spf13/afero" "github.com/spf13/cast" diff --git a/viper_test.go b/viper_test.go index 0b1f407..acef12a 100644 --- a/viper_test.go +++ b/viper_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/fsnotify/fsnotify" - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" "github.com/spf13/afero" "github.com/spf13/cast" "github.com/spf13/pflag"