Skip to content

Commit

Permalink
Move back to github.com/cozy/afero (#3783)
Browse files Browse the repository at this point in the history
After some bugs were found in the main branch a fork have been done
and some fix have been pushed into it.

Since then the fix have reached the main branch so there is no more
need for a fork and we can return to the main branch

This review have been generated with the following command:
```bash
sed -i 's/cozy\/afero/spf13\/afero/g' **/*.go
go mod tidy
```
  • Loading branch information
Peltoche committed Feb 23, 2023
1 parent 1b858be commit eef402f
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 23 deletions.
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion model/app/apps.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion model/app/fetcher_git.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion model/app/installer_konnector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion model/app/installer_webapp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion model/app/webapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion model/instance/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion model/move/archiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion model/vfs/vfsafero/fsck.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion model/vfs/vfsafero/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion model/vfs/vfsafero/thumbs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/appfs/copier.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/appfs/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/assets/dynamic/impl_os.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/previewfs/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion worker/exec/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion worker/exec/konnector.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion worker/exec/konnector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion worker/exec/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion worker/mails/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit eef402f

Please sign in to comment.