From e51bb28a76a2b68d357250eeaa5674df6afca2c9 Mon Sep 17 00:00:00 2001 From: abbypan Date: Wed, 31 Jul 2024 18:13:39 +0800 Subject: [PATCH] mergo --- cmd/common/config.go | 2 +- fs/graph/graph.go | 2 +- fs/graph/oauth2.go | 2 +- go.mod | 2 +- go.sum | 7 ++----- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cmd/common/config.go b/cmd/common/config.go index d62735f..9af9835 100644 --- a/cmd/common/config.go +++ b/cmd/common/config.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/imdario/mergo" + "dario.cat/mergo" "github.com/jstaf/onedriver/fs/graph" "github.com/jstaf/onedriver/ui" "github.com/rs/zerolog/log" diff --git a/fs/graph/graph.go b/fs/graph/graph.go index d407c12..7a4e764 100644 --- a/fs/graph/graph.go +++ b/fs/graph/graph.go @@ -14,7 +14,7 @@ import ( "regexp" "time" - "github.com/imdario/mergo" + "dario.cat/mergo" "github.com/rs/zerolog/log" ) diff --git a/fs/graph/oauth2.go b/fs/graph/oauth2.go index f66f69f..7adf7e0 100644 --- a/fs/graph/oauth2.go +++ b/fs/graph/oauth2.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/imdario/mergo" + "dario.cat/mergo" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/go.mod b/go.mod index 91eea23..b238b4c 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/jstaf/onedriver require ( + dario.cat/mergo v1.0.0 github.com/coreos/go-systemd/v22 v22.3.2 github.com/godbus/dbus/v5 v5.0.6 github.com/gotk3/gotk3 v0.6.3 github.com/hanwen/go-fuse/v2 v2.4.2 - github.com/imdario/mergo v0.3.13 github.com/rs/zerolog v1.26.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 65c2e9e..eadb9d3 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= @@ -5,14 +7,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gotk3/gotk3 v0.6.2 h1:sx/PjaKfKULJPTPq8p2kn2ZbcNFxpOJqi4VLzMbEOO8= -github.com/gotk3/gotk3 v0.6.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q= github.com/gotk3/gotk3 v0.6.3 h1:+Ke4WkM1TQUNOlM2TZH6szqknqo+zNbX3BZWVXjSHYw= github.com/gotk3/gotk3 v0.6.3/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q= github.com/hanwen/go-fuse/v2 v2.4.2 h1:ujevavwvGMg4s1TTSGWqid0q7WHk0XC8EOzHtygnt9E= github.com/hanwen/go-fuse/v2 v2.4.2/go.mod h1:xKwi1cF7nXAOBCXujD5ie0ZKsxc8GGSA1rlMJc+8IJs= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= @@ -62,6 +60,5 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=