Skip to content

Commit 1f42364

Browse files
committed
Use github.com/go-viper/mapstructure/v2
Update mapstructure with a maintained fork. See: - mitchellh/mapstructure#349 Signed-off-by: Arnaud Meukam <[email protected]>
1 parent 402e904 commit 1f42364

19 files changed

+2552
-2
lines changed

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ require (
126126
github.com/go-openapi/jsonpointer v0.20.2 // indirect
127127
github.com/go-openapi/jsonreference v0.20.4 // indirect
128128
github.com/go-openapi/swag v0.22.7 // indirect
129+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
129130
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
130131
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
131132
github.com/golang/protobuf v1.5.3 // indirect

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmrid
206206
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
207207
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
208208
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
209+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c=
210+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
209211
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
210212
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
211213
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

upup/pkg/fi/cloudup/openstack/instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323

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

26+
"github.com/go-viper/mapstructure/v2"
2627
"github.com/gophercloud/gophercloud"
2728
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
2829
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers"
2930
v2pools "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
3031
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
31-
"github.com/mitchellh/mapstructure"
3232
"golang.org/x/sync/errgroup"
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
"k8s.io/klog/v2"

upup/pkg/fi/cloudup/openstack/verifier.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"strconv"
2626
"strings"
2727

28+
"github.com/go-viper/mapstructure/v2"
2829
"github.com/gophercloud/gophercloud"
2930
gos "github.com/gophercloud/gophercloud/openstack"
3031
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
31-
"github.com/mitchellh/mapstructure"
3232
"k8s.io/apimachinery/pkg/api/errors"
3333
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/client-go/kubernetes"

vendor/github.com/go-viper/mapstructure/v2/.editorconfig

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-viper/mapstructure/v2/.envrc

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-viper/mapstructure/v2/.gitignore

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-viper/mapstructure/v2/.golangci.yaml

+23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-viper/mapstructure/v2/CHANGELOG.md

+101
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-viper/mapstructure/v2/LICENSE

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-viper/mapstructure/v2/README.md

+59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)