ftp: Replace fakeDataConn with mockery

Author: NathanBaulch

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use context from `testing.T` introduced in Go 1.24.
 - Define more sentinel errors for more ergonomic error checking.
 - Use typed expectations consistently for added type safety.
+- Remove `fakeDataConn` mock and switch to mockery.
 ### Fixed
 - Use walrus assignment where possible.
 - Use the `any` keyword where possible.

backend/ftp/dataconn.go

@@ -147,7 +147,7 @@ func getDataConn(ctx context.Context, a authority.Authority, fs *FileSystem, f *
 		fs.dataconn = nil
 	}
 
-	if fs.dataconn == nil || fs.resetConn {
+	if fs.dataconn == nil {
 		client, err := fs.Client(ctx, a)
 		if err != nil {
 			return nil, err
@@ -176,10 +176,6 @@ func getDataConn(ctx context.Context, a authority.Authority, fs *FileSystem, f *
 				c:    client,
 			}
 		}
-		// ensure resetConn is false since we've opened/reopened the file
-		if f != nil {
-			fs.resetConn = false
-		}
 	}
 
 	return fs.dataconn, nil

backend/ftp/dataconn_test.go

@@ -230,10 +230,11 @@ func (s *dataConnSuite) TestGetDataConn_writeSuccess() {
 
 func (s *dataConnSuite) TestGetDataConn_readAfterWriteError() {
 	// open dataconn for read after dataconn for write exists - error on dataconn.Close
-	fakedconn := NewFakeDataConn(types.OpenWrite)
+	fakedconn := mocks.NewDataConn(s.T())
+	fakedconn.EXPECT().Mode().Return(types.OpenWrite)
 	closeErr := errors.New("some close err")
-	fakedconn.AssertCloseErr(closeErr)
-	s.ftpFile.Location().FileSystem().(*FileSystem).dataconn = fakedconn
+	fakedconn.EXPECT().Close().Return(closeErr).Once()
+	s.ftpFile.location.fileSystem.dataconn = fakedconn
 	dc, err := getDataConn(
 		s.T().Context(),
 		authority.Authority{},

backend/ftp/file.go

@@ -310,7 +310,7 @@ func (f *File) Close() error {
 		if err != nil {
 			return utils.WrapCloseError(err)
 		}
-		f.Location().FileSystem().(*FileSystem).resetConn = true
+		f.Location().FileSystem().(*FileSystem).dataconn = nil
 	}
 	// no op for unopened file
 	f.offset = 0
@@ -372,7 +372,7 @@ func (f *File) Seek(offset int64, whence int) (int64, error) {
 			if err != nil {
 				return 0, utils.WrapSeekError(err)
 			}
-			f.Location().FileSystem().(*FileSystem).resetConn = true
+			f.Location().FileSystem().(*FileSystem).dataconn = nil
 		case 2: // offset from end of the file
 			sz, err := f.Size()
 			if err != nil {
@@ -393,7 +393,7 @@ func (f *File) Seek(offset int64, whence int) (int64, error) {
 			if err != nil {
 				return 0, utils.WrapSeekError(err)
 			}
-			f.Location().FileSystem().(*FileSystem).resetConn = true
+			f.Location().FileSystem().(*FileSystem).dataconn = nil
 		}
 	}
 

backend/ftp/fileSystem.go

@@ -30,7 +30,6 @@ type FileSystem struct {
 	options   Options
 	ftpclient types.Client
 	dataconn  types.DataConn
-	resetConn bool
 }
 
 // NewFileSystem initializer for fileSystem struct.