diff --git a/go.mod b/go.mod index c2e5265c4a5..c138fe4390b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/andybalholm/brotli v1.0.5 github.com/appleboy/go-fcm v0.1.5 github.com/bradfitz/latlong v0.0.0-20170410180902-f3db6d0dff40 - github.com/cozy/afero v1.3.0 github.com/cozy/goexif2 v1.2.0 github.com/cozy/gomail v0.0.0-20170313100128-1395d9a6a6c0 github.com/cozy/httpcache v0.0.0-20210224123405-3f334f841945 @@ -40,6 +39,7 @@ require ( github.com/robfig/cron/v3 v3.0.1 github.com/sideshow/apns2 v0.23.0 github.com/sirupsen/logrus v1.9.0 + github.com/spf13/afero v1.9.4 github.com/spf13/cobra v1.6.1 github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.1 @@ -88,7 +88,6 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sanity-io/litter v1.5.5 // indirect github.com/sergi/go-diff v1.0.0 // indirect - github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/go.sum b/go.sum index 52c478522ec..f9210e5843a 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cozy/afero v1.3.0 h1:gTaLGZhm/9VYiBuXkW5pOAePAR6P8ssp2ekMdyZBInk= -github.com/cozy/afero v1.3.0/go.mod h1:1et9YdBqQDeXGpaxOLtmXZoCUB6eaS2L+x7Irs3UktA= github.com/cozy/goexif2 v1.2.0 h1:cBPS+7niEtwehOYBcDBSyvo+x6LPcaFVvm7Nsu6fxeM= github.com/cozy/goexif2 v1.2.0/go.mod h1:mBLIra4pwtUmAakLxbwF8v94QD5PdluAW1i7pisBk3w= github.com/cozy/gomail v0.0.0-20170313100128-1395d9a6a6c0 h1:bQVNaGvnUI7m8J8k3hklFVXRT1F+WJcIV6hYHIgjKHE= @@ -400,6 +398,8 @@ github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs github.com/spf13/afero v0.0.0-20170901052352-ee1bd8ee15a1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.4 h1:Sd43wM1IWz/s1aVXdOBkjJvuP8UdyqioeE4AmM0QsBs= +github.com/spf13/afero v1.9.4/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.1.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= diff --git a/model/app/apps.go b/model/app/apps.go index 001378f6736..aa304f447a1 100644 --- a/model/app/apps.go +++ b/model/app/apps.go @@ -7,7 +7,6 @@ import ( "path" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/instance" "github.com/cozy/cozy-stack/model/permission" "github.com/cozy/cozy-stack/model/vfs" @@ -17,6 +16,7 @@ import ( "github.com/cozy/cozy-stack/pkg/consts" "github.com/cozy/cozy-stack/pkg/couchdb" "github.com/cozy/cozy-stack/pkg/prefixer" + "github.com/spf13/afero" ) const ( diff --git a/model/app/fetcher_git.go b/model/app/fetcher_git.go index 91452103928..1cc647e1253 100644 --- a/model/app/fetcher_git.go +++ b/model/app/fetcher_git.go @@ -16,9 +16,9 @@ import ( "strings" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/pkg/appfs" "github.com/cozy/cozy-stack/pkg/logger" + "github.com/spf13/afero" ) var cloneTimeout = 30 * time.Second diff --git a/model/app/installer_konnector_test.go b/model/app/installer_konnector_test.go index f77cf79961d..ec18ae57ac3 100644 --- a/model/app/installer_konnector_test.go +++ b/model/app/installer_konnector_test.go @@ -13,7 +13,6 @@ import ( "time" "github.com/andybalholm/brotli" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/app" "github.com/cozy/cozy-stack/model/instance" "github.com/cozy/cozy-stack/model/instance/lifecycle" @@ -23,6 +22,7 @@ import ( "github.com/cozy/cozy-stack/pkg/consts" "github.com/cozy/cozy-stack/pkg/couchdb" "github.com/cozy/cozy-stack/tests/testutils" + "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" diff --git a/model/app/installer_webapp_test.go b/model/app/installer_webapp_test.go index 46f9b22572d..d795bfbe884 100644 --- a/model/app/installer_webapp_test.go +++ b/model/app/installer_webapp_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/app" "github.com/cozy/cozy-stack/model/instance" "github.com/cozy/cozy-stack/model/instance/lifecycle" @@ -24,6 +23,7 @@ import ( "github.com/cozy/cozy-stack/pkg/couchdb" "github.com/cozy/cozy-stack/tests/testutils" "github.com/cozy/cozy-stack/web/statik" + "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" diff --git a/model/app/webapp.go b/model/app/webapp.go index d59656dc8c0..c5318a06c1e 100644 --- a/model/app/webapp.go +++ b/model/app/webapp.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/instance" "github.com/cozy/cozy-stack/model/job" "github.com/cozy/cozy-stack/model/notification" @@ -21,6 +20,7 @@ import ( "github.com/cozy/cozy-stack/pkg/couchdb" "github.com/cozy/cozy-stack/pkg/metadata" "github.com/cozy/cozy-stack/pkg/prefixer" + "github.com/spf13/afero" ) // defaultAppListLimit is the default limit for returned documents diff --git a/model/instance/instance.go b/model/instance/instance.go index 37ee5487412..1ae27a8a0b9 100644 --- a/model/instance/instance.go +++ b/model/instance/instance.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/permission" "github.com/cozy/cozy-stack/model/vfs" "github.com/cozy/cozy-stack/model/vfs/vfsafero" @@ -24,6 +23,7 @@ import ( "github.com/cozy/cozy-stack/pkg/lock" "github.com/cozy/cozy-stack/pkg/logger" "github.com/cozy/cozy-stack/pkg/prefixer" + "github.com/spf13/afero" ) // DefaultTemplateTitle represents the default template title. It could be diff --git a/model/move/archiver.go b/model/move/archiver.go index 0a946644834..be36ccb9b7e 100644 --- a/model/move/archiver.go +++ b/model/move/archiver.go @@ -10,12 +10,12 @@ import ( "strconv" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/instance" "github.com/cozy/cozy-stack/pkg/config/config" "github.com/cozy/cozy-stack/pkg/crypto" multierror "github.com/hashicorp/go-multierror" "github.com/ncw/swift/v2" + "github.com/spf13/afero" ) var ( diff --git a/model/vfs/vfsafero/fsck.go b/model/vfs/vfsafero/fsck.go index 938b7eaf09e..fed247816f1 100644 --- a/model/vfs/vfsafero/fsck.go +++ b/model/vfs/vfsafero/fsck.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/vfs" "github.com/cozy/cozy-stack/pkg/consts" "github.com/cozy/cozy-stack/pkg/couchdb" + "github.com/spf13/afero" ) var errFailFast = errors.New("fail fast") diff --git a/model/vfs/vfsafero/impl.go b/model/vfs/vfsafero/impl.go index a979dc9fc83..5470629e8f6 100644 --- a/model/vfs/vfsafero/impl.go +++ b/model/vfs/vfsafero/impl.go @@ -19,7 +19,7 @@ import ( "github.com/cozy/cozy-stack/pkg/filetype" "github.com/cozy/cozy-stack/pkg/lock" - "github.com/cozy/afero" + "github.com/spf13/afero" ) var memfsMap sync.Map diff --git a/model/vfs/vfsafero/thumbs.go b/model/vfs/vfsafero/thumbs.go index 671bb8a45de..09543b5b884 100644 --- a/model/vfs/vfsafero/thumbs.go +++ b/model/vfs/vfsafero/thumbs.go @@ -7,10 +7,10 @@ import ( "os" "path" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/vfs" "github.com/cozy/cozy-stack/pkg/consts" multierror "github.com/hashicorp/go-multierror" + "github.com/spf13/afero" ) // NewThumbsFs creates a new thumb filesystem base on a afero.Fs. diff --git a/pkg/appfs/copier.go b/pkg/appfs/copier.go index 48c8bb3d17e..6c6994c3d46 100644 --- a/pkg/appfs/copier.go +++ b/pkg/appfs/copier.go @@ -11,12 +11,12 @@ import ( "time" "github.com/andybalholm/brotli" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/pkg/consts" "github.com/cozy/cozy-stack/pkg/filetype" "github.com/cozy/cozy-stack/pkg/logger" "github.com/cozy/cozy-stack/pkg/utils" "github.com/ncw/swift/v2" + "github.com/spf13/afero" ) // Copier is an interface defining a common set of functions for the installer diff --git a/pkg/appfs/server.go b/pkg/appfs/server.go index 87405b627f9..dd8820cf7e1 100644 --- a/pkg/appfs/server.go +++ b/pkg/appfs/server.go @@ -19,11 +19,11 @@ import ( "time" "github.com/andybalholm/brotli" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/pkg/consts" web_utils "github.com/cozy/cozy-stack/pkg/utils" "github.com/labstack/echo/v4" "github.com/ncw/swift/v2" + "github.com/spf13/afero" ) // FileServer interface defines a way to access and serve the application's diff --git a/pkg/assets/dynamic/impl_os.go b/pkg/assets/dynamic/impl_os.go index c0c96f4144b..d175d7877d6 100644 --- a/pkg/assets/dynamic/impl_os.go +++ b/pkg/assets/dynamic/impl_os.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/pkg/assets/model" "github.com/cozy/cozy-stack/pkg/config/config" + "github.com/spf13/afero" ) // DynamicAssetsFolderName is the folder name for dynamic assets diff --git a/pkg/previewfs/cache.go b/pkg/previewfs/cache.go index ce5b0421bb0..3d62f95f5e5 100644 --- a/pkg/previewfs/cache.go +++ b/pkg/previewfs/cache.go @@ -12,9 +12,9 @@ import ( "strconv" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/pkg/config/config" "github.com/ncw/swift/v2" + "github.com/spf13/afero" ) const ( diff --git a/worker/exec/common.go b/worker/exec/common.go index df693aa98ae..108e92f7220 100644 --- a/worker/exec/common.go +++ b/worker/exec/common.go @@ -11,13 +11,13 @@ import ( "strconv" "time" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/instance" "github.com/cozy/cozy-stack/model/job" "github.com/cozy/cozy-stack/pkg/logger" "github.com/cozy/cozy-stack/pkg/metrics" "github.com/cozy/cozy-stack/pkg/utils" "github.com/prometheus/client_golang/prometheus" + "github.com/spf13/afero" ) var defaultTimeout = 300 * time.Second diff --git a/worker/exec/konnector.go b/worker/exec/konnector.go index b9b69ca842d..2287d979c54 100644 --- a/worker/exec/konnector.go +++ b/worker/exec/konnector.go @@ -11,7 +11,6 @@ import ( "strconv" "strings" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/account" "github.com/cozy/cozy-stack/model/app" "github.com/cozy/cozy-stack/model/instance" @@ -27,6 +26,7 @@ import ( "github.com/cozy/cozy-stack/pkg/metadata" "github.com/cozy/cozy-stack/pkg/realtime" "github.com/cozy/cozy-stack/pkg/registry" + "github.com/spf13/afero" "golang.org/x/text/cases" "golang.org/x/text/language" ) diff --git a/worker/exec/konnector_test.go b/worker/exec/konnector_test.go index 1f5881b9b33..3c686355628 100644 --- a/worker/exec/konnector_test.go +++ b/worker/exec/konnector_test.go @@ -8,7 +8,6 @@ import ( "sync" "testing" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/account" "github.com/cozy/cozy-stack/model/app" "github.com/cozy/cozy-stack/model/job" @@ -21,6 +20,7 @@ import ( "github.com/cozy/cozy-stack/pkg/realtime" "github.com/cozy/cozy-stack/tests/testutils" jwt "github.com/golang-jwt/jwt/v4" + "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/worker/exec/service.go b/worker/exec/service.go index 19c3ef35a7d..a423dc17228 100644 --- a/worker/exec/service.go +++ b/worker/exec/service.go @@ -8,7 +8,6 @@ import ( "os" "path" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/app" "github.com/cozy/cozy-stack/model/instance" "github.com/cozy/cozy-stack/model/job" @@ -17,6 +16,7 @@ import ( "github.com/cozy/cozy-stack/pkg/consts" "github.com/cozy/cozy-stack/pkg/couchdb" "github.com/cozy/cozy-stack/pkg/logger" + "github.com/spf13/afero" ) // ServiceOptions contains the options to execute a service. diff --git a/worker/mails/exec.go b/worker/mails/exec.go index cdd88779163..e464336351d 100644 --- a/worker/mails/exec.go +++ b/worker/mails/exec.go @@ -5,12 +5,12 @@ import ( "io" "os" - "github.com/cozy/afero" "github.com/cozy/cozy-stack/model/job" "github.com/cozy/cozy-stack/pkg/assets" "github.com/cozy/cozy-stack/pkg/config/config" "github.com/cozy/cozy-stack/pkg/utils" "github.com/cozy/cozy-stack/worker/exec" + "github.com/spf13/afero" ) func execMjml(ctx *job.WorkerContext, template []byte) ([]byte, error) {