This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 309c62799 chore(dependencies): update mapstructure
309c62799 is described below
commit 309c62799b0528129549a0eeb6fc4cdc4a52b979
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Thu Nov 28 18:23:10 2024 +0100
chore(dependencies): update mapstructure
Closes #5858
---
go.mod | 3 ++-
go.sum | 2 ++
pkg/cmd/util.go | 2 +-
pkg/trait/trait_configure.go | 2 +-
pkg/trait/trait_support.go | 2 +-
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/go.mod b/go.mod
index 2fa5b47da..b8b01308d 100644
--- a/go.mod
+++ b/go.mod
@@ -9,13 +9,13 @@ require (
github.com/fsnotify/fsnotify v1.8.0
github.com/gertd/go-pluralize v0.2.1
github.com/go-logr/logr v1.4.2
+ github.com/go-viper/mapstructure/v2 v2.2.1
github.com/google/go-github/v52 v52.0.0
github.com/google/uuid v1.6.0
github.com/imdario/mergo v0.3.16
github.com/jpillora/backoff v1.0.0
github.com/magiconair/properties v1.8.7
github.com/mattn/go-shellwords v1.0.12
- github.com/mitchellh/mapstructure v1.5.0
github.com/onsi/gomega v1.36.0
// go get github.com/openshift/api@release-4.15
github.com/openshift/api v0.0.0-20240228005710-4511c790cc60
@@ -104,6 +104,7 @@ require (
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de //
indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
+ github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd //
indirect
diff --git a/go.sum b/go.sum
index 9808cc807..0a5405440 100644
--- a/go.sum
+++ b/go.sum
@@ -152,6 +152,8 @@ github.com/go-stack/stack v1.8.0/go.mod
h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig/v3 v3.0.0
h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod
h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/go-viper/mapstructure/v2 v2.2.1
h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod
h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
github.com/gogo/protobuf v1.1.1/go.mod
h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod
h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
index a30e2c0b8..73b78582c 100644
--- a/pkg/cmd/util.go
+++ b/pkg/cmd/util.go
@@ -26,7 +26,7 @@ import (
"reflect"
"strings"
- "github.com/mitchellh/mapstructure"
+ "github.com/go-viper/mapstructure/v2"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/client"
diff --git a/pkg/trait/trait_configure.go b/pkg/trait/trait_configure.go
index b14d40b77..bd617bdcc 100644
--- a/pkg/trait/trait_configure.go
+++ b/pkg/trait/trait_configure.go
@@ -24,7 +24,7 @@ import (
"reflect"
"strings"
- "github.com/mitchellh/mapstructure"
+ "github.com/go-viper/mapstructure/v2"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util"
diff --git a/pkg/trait/trait_support.go b/pkg/trait/trait_support.go
index eca4ba63f..a78091eff 100644
--- a/pkg/trait/trait_support.go
+++ b/pkg/trait/trait_support.go
@@ -27,7 +27,7 @@ import (
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util"
- "github.com/mitchellh/mapstructure"
+ "github.com/go-viper/mapstructure/v2"
)
type optionMap map[string]map[string]interface{}
