Skip to content

Commit 39c9ebc

Browse files
committed
vendor: migrate to github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1
github.com/mitchellh/mapstructure will no longer be maintained by the author, and github.com/go-viper/mapstructure is nominated as the endorsed fork. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 3c0c68a commit 39c9ebc

17 files changed

+583
-88
lines changed

cli/compose/loader/loader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/docker/docker/api/types/versions"
2222
"github.com/docker/go-connections/nat"
2323
units "github.com/docker/go-units"
24+
"github.com/go-viper/mapstructure/v2"
2425
"github.com/google/shlex"
25-
"github.com/mitchellh/mapstructure"
2626
"github.com/pkg/errors"
2727
"github.com/sirupsen/logrus"
2828
yaml "gopkg.in/yaml.v2"

vendor.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ require (
1717
github.com/docker/go-connections v0.4.1-0.20231110212414-fa09c952e3ea
1818
github.com/docker/go-units v0.5.0
1919
github.com/fvbommel/sortorder v1.0.2
20+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1
2021
github.com/gogo/protobuf v1.3.2
2122
github.com/google/go-cmp v0.5.9
2223
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
2324
github.com/mattn/go-runewidth v0.0.15
24-
github.com/mitchellh/mapstructure v1.5.0
2525
github.com/moby/patternmatcher v0.6.0
2626
github.com/moby/swarmkit/v2 v2.0.0-20230911190601-f082dd7a0cee
2727
github.com/moby/sys/sequential v0.5.0

vendor.sum

+3-2
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
9191
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
9292
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
9393
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
94+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c=
95+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
9496
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
9597
github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
9698
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -161,9 +163,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr
161163
github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
162164
github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
163165
github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
166+
github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I=
164167
github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
165-
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
166-
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
167168
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
168169
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
169170
github.com/moby/swarmkit/v2 v2.0.0-20230911190601-f082dd7a0cee h1:T7Mz81wbNduphN0195OfYadKSs/uQKr4zrKtsCSfQTc=

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/mitchellh/mapstructure/CHANGELOG.md renamed to vendor/github.com/go-viper/mapstructure/v2/CHANGELOG.md

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

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

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

vendor/github.com/mitchellh/mapstructure/decode_hooks.go renamed to vendor/github.com/go-viper/mapstructure/v2/decode_hooks.go

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

0 commit comments

Comments
 (0)