Skip to content

Commit ab7a6e9

Browse files
thaJeztahndeloof
authored andcommitted
pkg/compose: remove uses of deprecated mitchellh/mapstructure module
The github.com/mitchellh/mapstructure module was archived and is no longer maintained. This module has moved to github.com/go-viper/mapstructure, which updated to v2, with a minor breaking change in v2.0; > Error is removed in favor of errors.Join (backported from Go 1.20 to > preserve compatibility with earlier versions) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 2ca7b96 commit ab7a6e9

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ require (
2222
github.com/docker/go-units v0.5.0
2323
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203
2424
github.com/fsnotify/fsevents v0.2.0
25+
github.com/go-viper/mapstructure/v2 v2.4.0
2526
github.com/google/go-cmp v0.7.0
2627
github.com/hashicorp/go-version v1.7.0
2728
github.com/jonboulle/clockwork v0.5.0
2829
github.com/mattn/go-shellwords v1.0.12
2930
github.com/mitchellh/go-ps v1.0.0
30-
github.com/mitchellh/mapstructure v1.5.0
3131
github.com/moby/buildkit v0.24.0
3232
github.com/moby/go-archive v0.1.0
3333
github.com/moby/patternmatcher v0.6.0
@@ -101,7 +101,6 @@ require (
101101
github.com/go-openapi/jsonpointer v0.21.0 // indirect
102102
github.com/go-openapi/jsonreference v0.20.2 // indirect
103103
github.com/go-openapi/swag v0.23.0 // indirect
104-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
105104
github.com/gofrs/flock v0.12.1 // indirect
106105
github.com/gogo/protobuf v1.3.2 // indirect
107106
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
@@ -131,6 +130,7 @@ require (
131130
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
132131
github.com/miekg/pkcs11 v1.1.1 // indirect
133132
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
133+
github.com/mitchellh/mapstructure v1.5.0 // indirect
134134
github.com/moby/docker-image-spec v1.3.1 // indirect
135135
github.com/moby/locker v1.0.1 // indirect
136136
github.com/moby/spdystream v0.5.0 // indirect

pkg/compose/watch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"github.com/docker/docker/api/types/container"
4444
"github.com/docker/docker/api/types/filters"
4545
"github.com/docker/docker/api/types/image"
46-
"github.com/mitchellh/mapstructure"
46+
"github.com/go-viper/mapstructure/v2"
4747
"github.com/sirupsen/logrus"
4848
"golang.org/x/sync/errgroup"
4949
)

0 commit comments

Comments
 (0)