Skip to content

Commit

Permalink
Use github.com/go-viper/mapstructure/v2
Browse files Browse the repository at this point in the history
Update mapstructure with a maintained fork.

See:
  - mitchellh/mapstructure#349

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
  • Loading branch information
ameukam committed Mar 12, 2024
1 parent 402e904 commit cf3d7af
Show file tree
Hide file tree
Showing 19 changed files with 2,553 additions and 3 deletions.
3 changes: 2 additions & 1 deletion go.mod
Expand Up @@ -23,6 +23,7 @@ require (
github.com/digitalocean/godo v1.109.0
github.com/go-ini/ini v1.67.0
github.com/go-logr/logr v1.4.1
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1
github.com/gogo/protobuf v1.3.2
github.com/google/go-cmp v0.6.0
github.com/google/go-containerregistry v0.19.0
Expand All @@ -32,7 +33,6 @@ require (
github.com/gophercloud/gophercloud v1.11.0
github.com/hetznercloud/hcloud-go v1.53.0
github.com/jacksontj/memberlistmesh v0.0.0-20190905163944-93462b9d2bb7
github.com/mitchellh/mapstructure v1.5.0
github.com/pelletier/go-toml v1.9.5
github.com/pkg/sftp v1.13.6
github.com/prometheus/client_golang v1.19.0
Expand Down Expand Up @@ -174,6 +174,7 @@ require (
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Expand Up @@ -206,6 +206,8 @@ github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmrid
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
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/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/openstack/instance.go
Expand Up @@ -23,12 +23,12 @@ import (

"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"

"github.com/go-viper/mapstructure/v2"
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers"
v2pools "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
"github.com/mitchellh/mapstructure"
"golang.org/x/sync/errgroup"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/openstack/verifier.go
Expand Up @@ -25,10 +25,10 @@ import (
"strconv"
"strings"

"github.com/go-viper/mapstructure/v2"
"github.com/gophercloud/gophercloud"
gos "github.com/gophercloud/gophercloud/openstack"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
"github.com/mitchellh/mapstructure"
"k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
18 changes: 18 additions & 0 deletions vendor/github.com/go-viper/mapstructure/v2/.editorconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/go-viper/mapstructure/v2/.envrc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/go-viper/mapstructure/v2/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions vendor/github.com/go-viper/mapstructure/v2/.golangci.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 101 additions & 0 deletions vendor/github.com/go-viper/mapstructure/v2/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions vendor/github.com/go-viper/mapstructure/v2/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions vendor/github.com/go-viper/mapstructure/v2/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cf3d7af

Please sign in to comment.