Update module github.com/imdario/mergo to v1

Signed-off-by: Nic Cope <nicc@rk0n.org>
crossplane · Jun 22, 2023 · ea390ff · ea390ff
1 parent a780989
commit ea390ff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/apis/common/v1/merge.go b/apis/common/v1/merge.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 )
 
 // MergeOptions Specifies merge options on a field path

diff --git a/apis/common/v1/merge_test.go b/apis/common/v1/merge_test.go
@@ -22,8 +22,8 @@ import (
 	"sort"
 	"testing"
 
+	"dario.cat/mergo"
 	"github.com/google/go-cmp/cmp"
-	"github.com/imdario/mergo"
 )
 
 type mergoOptArr []func(*mergo.Config)

diff --git a/go.mod b/go.mod
@@ -3,12 +3,12 @@ module github.com/crossplane/crossplane-runtime
 go 1.18
 
 require (
+	dario.cat/mergo v1.0.0
 	github.com/bufbuild/buf v1.21.0
 	github.com/go-logr/logr v1.2.4
 	github.com/google/go-cmp v0.5.9
 	github.com/hashicorp/go-getter v1.7.1
 	github.com/hashicorp/vault/api v1.9.2
-	github.com/imdario/mergo v0.3.16
 	github.com/spf13/afero v1.9.5
 	golang.org/x/time v0.3.0
 	google.golang.org/grpc v1.56.1
@@ -81,6 +81,7 @@ require (
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jdxcode/netrc v0.0.0-20221124155335-4616370d1a84 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect

diff --git a/go.sum b/go.sum
@@ -188,6 +188,8 @@ cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xX
 cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
 cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
 cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=

diff --git a/pkg/fieldpath/merge.go b/pkg/fieldpath/merge.go
@@ -19,7 +19,7 @@ package fieldpath
 import (
 	"reflect"
 
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/errors"