From ab7a6e9322eab5da90f289503d8e8f37adac3d37 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 23 Sep 2025 22:03:04 +0200 Subject: [PATCH] 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 --- go.mod | 4 ++-- pkg/compose/watch.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4228c1b02..dacfe7896 100644 --- a/go.mod +++ b/go.mod @@ -22,12 +22,12 @@ require ( github.com/docker/go-units v0.5.0 github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 github.com/fsnotify/fsevents v0.2.0 + github.com/go-viper/mapstructure/v2 v2.4.0 github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-version v1.7.0 github.com/jonboulle/clockwork v0.5.0 github.com/mattn/go-shellwords v1.0.12 github.com/mitchellh/go-ps v1.0.0 - github.com/mitchellh/mapstructure v1.5.0 github.com/moby/buildkit v0.24.0 github.com/moby/go-archive v0.1.0 github.com/moby/patternmatcher v0.6.0 @@ -101,7 +101,6 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.23.0 // indirect - github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gofrs/flock v0.12.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.2.2 // indirect @@ -131,6 +130,7 @@ require ( github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/spdystream v0.5.0 // indirect diff --git a/pkg/compose/watch.go b/pkg/compose/watch.go index ea63de26c..192e8c911 100644 --- a/pkg/compose/watch.go +++ b/pkg/compose/watch.go @@ -43,7 +43,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" )