diff --git a/go.mod b/go.mod
index 39b57e34c20f0a71a2208989cb65f6c95e96d7b8..0de1d23ced1dc42ad8a18b489d369b0f8d9368f3 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
github.com/andybalholm/brotli v1.0.4
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 v0.0.0-20200819113101-00e1cc8cc9d3
github.com/cozy/gomail v0.0.0-20170313100128-1395d9a6a6c0
github.com/cozy/httpcache v0.0.0-20210224123405-3f334f841945
@@ -40,7 +41,6 @@ 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.3
github.com/spf13/cobra v1.6.1
github.com/spf13/viper v1.13.0
github.com/stretchr/testify v1.8.1
@@ -54,5 +54,3 @@ require (
golang.org/x/text v0.3.7
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
)
-
-replace github.com/spf13/afero => github.com/cozy/afero v1.2.3
diff --git a/go.sum b/go.sum
index fe011629f93c488196252b8146ff9217b5920a8d..95fbc2a0fb5d73c52dac5281e944f30bd5a11060 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
@@ -16,6 +17,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY
cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
@@ -51,6 +53,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -107,8 +110,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cozy/afero v1.2.3 h1:o7VaYUHrGDr7AgoIUCxC0xLdRcyS2OK5/btm2GrgjGI=
-github.com/cozy/afero v1.2.3/go.mod h1:1et9YdBqQDeXGpaxOLtmXZoCUB6eaS2L+x7Irs3UktA=
+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 v0.0.0-20200819113101-00e1cc8cc9d3 h1:5suSF3q7eNhzpwjs+kjI9x5SnjaE3RV75s1PIGu99u8=
github.com/cozy/goexif2 v0.0.0-20200819113101-00e1cc8cc9d3/go.mod h1:PWaQhEQb7UWuVUvXxpFBscfsXmUASdlmMgq97QGcTwU=
github.com/cozy/gomail v0.0.0-20170313100128-1395d9a6a6c0 h1:bQVNaGvnUI7m8J8k3hklFVXRT1F+WJcIV6hYHIgjKHE=
@@ -256,6 +259,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -272,6 +276,7 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
+github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gregjones/httpcache v0.0.0-20170920190843-316c5e0ff04e/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -338,6 +343,7 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -428,6 +434,7 @@ github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaF
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
@@ -481,6 +488,9 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v0.0.0-20170901052352-ee1bd8ee15a1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
+github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
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=
@@ -557,7 +567,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
@@ -633,6 +645,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
@@ -743,6 +756,7 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -750,6 +764,7 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -846,6 +861,7 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -942,7 +958,9 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
diff --git a/model/app/apps.go b/model/app/apps.go
index aa304f447a1a0c57d0dcc0f9318e9fa55090ef8f..001378f6736d5459f55378da6e014aa81bb921b4 100644
--- a/model/app/apps.go
+++ b/model/app/apps.go
@@ -7,6 +7,7 @@ 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"
@@ -16,7 +17,6 @@ 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 7efed817113825394161eed1a7dc78470fca2b7a..89bc8d4995015434f9b0e2061c2f22cc3ddb45b8 100644
--- a/model/app/fetcher_git.go
+++ b/model/app/fetcher_git.go
@@ -17,9 +17,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 3634bf2ecc6f783508d8d5fa8d77bdf90985f0f0..8763428f6fcc0d6277d22f3932680e73ad18a386 100644
--- a/model/app/installer_konnector_test.go
+++ b/model/app/installer_konnector_test.go
@@ -7,11 +7,11 @@ import (
"testing"
"github.com/andybalholm/brotli"
+ "github.com/cozy/afero"
"github.com/cozy/cozy-stack/model/app"
"github.com/cozy/cozy-stack/model/instance/lifecycle"
"github.com/cozy/cozy-stack/pkg/config/config"
"github.com/cozy/cozy-stack/pkg/consts"
- "github.com/spf13/afero"
"github.com/stretchr/testify/assert"
)
diff --git a/model/app/installer_test.go b/model/app/installer_test.go
index f93783b085cc8bd175f76171f91e22ee05b3d2e0..6c6f4f0ad07fe7683b6e116244137c53696d84ed 100644
--- a/model/app/installer_test.go
+++ b/model/app/installer_test.go
@@ -13,6 +13,7 @@ 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/stack"
@@ -20,7 +21,6 @@ import (
"github.com/cozy/cozy-stack/pkg/config/config"
"github.com/cozy/cozy-stack/pkg/consts"
"github.com/cozy/cozy-stack/pkg/couchdb"
- "github.com/spf13/afero"
"golang.org/x/sync/errgroup"
)
diff --git a/model/app/installer_webapp_test.go b/model/app/installer_webapp_test.go
index de17e94eb09be7b6e8c150d52b50fd58145fd76d..740096d08dccea0bfcd4471182b2d673aaf90c78 100644
--- a/model/app/installer_webapp_test.go
+++ b/model/app/installer_webapp_test.go
@@ -5,6 +5,7 @@ import (
"path"
"testing"
+ "github.com/cozy/afero"
"github.com/cozy/cozy-stack/model/app"
"github.com/cozy/cozy-stack/model/instance/lifecycle"
"github.com/cozy/cozy-stack/model/job"
@@ -12,7 +13,6 @@ import (
"github.com/cozy/cozy-stack/pkg/config/config"
"github.com/cozy/cozy-stack/pkg/consts"
"github.com/cozy/cozy-stack/pkg/couchdb"
- "github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/model/app/webapp.go b/model/app/webapp.go
index 33f444dc9af24e6334cbd16f43f2ab8fb2cf43cb..1ee174027920e9e3962bf4d4916a2f75ec36e9a6 100644
--- a/model/app/webapp.go
+++ b/model/app/webapp.go
@@ -10,6 +10,7 @@ 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"
@@ -19,7 +20,6 @@ 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 1292875b18115e12f6b33a4b82e534295dbf4a39..083ee1be373c30a12f387b921af6153c45b3d291 100644
--- a/model/instance/instance.go
+++ b/model/instance/instance.go
@@ -9,6 +9,7 @@ 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"
@@ -23,7 +24,6 @@ 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 180c6e9247cab2876545b04200d3176bf61036c5..cbf8cc58a626d9702d70d42f40fbd2603cfd5c44 100644
--- a/model/move/archiver.go
+++ b/model/move/archiver.go
@@ -9,12 +9,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 0bced70f49df02a607634aa7b73f08ef287b45a2..55580b17992226ecf2e9a4ab03c8bb151376eb0a 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 c0eb095a38af005dacb2ea17818825e682a9ce8f..647f702063699d6db290ff01eebc29c19d8c0f73 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/spf13/afero"
+ "github.com/cozy/afero"
)
var memfsMap sync.Map
diff --git a/model/vfs/vfsafero/thumbs.go b/model/vfs/vfsafero/thumbs.go
index 09543b5b884331f387d1b2b840fc1b6e7fe623de..671bb8a45ded60683daa3134e9f333abc8681f83 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 eeb5d9ffca60a17d0f83fd9c267e3693d4df5f00..63c182191ca711a6ef185345c652f29c7dd2bd65 100644
--- a/pkg/appfs/copier.go
+++ b/pkg/appfs/copier.go
@@ -10,12 +10,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 7f5cd9da3ab97ef09fb549f47f7c83e1371333f4..f405bee3fe9ce427f3932e1dc8737949eff8cb58 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/fs.go b/pkg/assets/dynamic/fs.go
index d831a43d56ef1eee6bfd883b84911e185467989c..ac30f623f1dd4fa7bfcf567423f7558efaf4691e 100644
--- a/pkg/assets/dynamic/fs.go
+++ b/pkg/assets/dynamic/fs.go
@@ -13,10 +13,10 @@ 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/ncw/swift/v2"
- "github.com/spf13/afero"
)
var assetFS assetsFS
diff --git a/pkg/previewfs/cache.go b/pkg/previewfs/cache.go
index 22ef65cd1233ccd2fc799370d7ad0450ca5bf747..baeff94d6c53f9c130babfeaa38ea9b72555bd01 100644
--- a/pkg/previewfs/cache.go
+++ b/pkg/previewfs/cache.go
@@ -11,9 +11,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 108e92f7220d96a3c5438105cb2fe6fd5a7e2e39..df693aa98ae918c3ed54c90c17b3dbe8170c8456 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 5bd414a84e22ea8d1e200071486f9dee6a9f3c60..efb13aea688d2762c4819e8406a267ae54a728c3 100644
--- a/worker/exec/konnector.go
+++ b/worker/exec/konnector.go
@@ -11,6 +11,7 @@ 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"
@@ -26,7 +27,6 @@ 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 4c7502502de1f40cdf4cda1c82703501650ed1a0..7286cf3a6b9d391d3d3fe9b143fb20c200394841 100644
--- a/worker/exec/konnector_test.go
+++ b/worker/exec/konnector_test.go
@@ -7,6 +7,7 @@ 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/instance"
@@ -20,7 +21,6 @@ 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"
)
diff --git a/worker/exec/service.go b/worker/exec/service.go
index 53b9f85672fd16f344c530ff5cfb8c09afd2b055..a1a31adb8437b12ad6170821e8f21966be36199a 100644
--- a/worker/exec/service.go
+++ b/worker/exec/service.go
@@ -8,6 +8,7 @@ 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"
@@ -16,7 +17,6 @@ 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 e464336351d25c9d4d544acceb139209ae64d57f..cdd88779163490f1182dbcae9b271d4dcfc5db7c 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) {