From d9f27b3a83d17412ce288d32fef71c5e9b7ad8ef Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Thu, 11 Jul 2024 14:46:33 +0200 Subject: [PATCH] Fix ceph build after storage.FS interface change --- pkg/storage/fs/cephfs/upload.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/storage/fs/cephfs/upload.go b/pkg/storage/fs/cephfs/upload.go index 47ca9a982b..031508cbea 100644 --- a/pkg/storage/fs/cephfs/upload.go +++ b/pkg/storage/fs/cephfs/upload.go @@ -42,17 +42,17 @@ import ( tusd "github.com/tus/tusd/pkg/handler" ) -func (fs *cephfs) Upload(ctx context.Context, req storage.UploadRequest, uff storage.UploadFinishedFunc) (provider.ResourceInfo, error) { +func (fs *cephfs) Upload(ctx context.Context, req storage.UploadRequest, uff storage.UploadFinishedFunc) (*provider.ResourceInfo, error) { user := fs.makeUser(ctx) upload, err := fs.GetUpload(ctx, req.Ref.GetPath()) if err != nil { metadata := map[string]string{"sizedeferred": "true"} uploadIDs, err := fs.InitiateUpload(ctx, req.Ref, 0, metadata) if err != nil { - return provider.ResourceInfo{}, err + return &provider.ResourceInfo{}, err } if upload, err = fs.GetUpload(ctx, uploadIDs["simple"]); err != nil { - return provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error retrieving upload") + return &provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error retrieving upload") } } @@ -61,19 +61,19 @@ func (fs *cephfs) Upload(ctx context.Context, req storage.UploadRequest, uff sto p := uploadInfo.info.Storage["InternalDestination"] ok, err := IsChunked(p) if err != nil { - return provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error checking path") + return &provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error checking path") } if ok { var assembledFile string p, assembledFile, err = NewChunkHandler(ctx, fs).WriteChunk(p, req.Body) if err != nil { - return provider.ResourceInfo{}, err + return &provider.ResourceInfo{}, err } if p == "" { if err = uploadInfo.Terminate(ctx); err != nil { - return provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error removing auxiliary files") + return &provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error removing auxiliary files") } - return provider.ResourceInfo{}, errtypes.PartialContent(req.Ref.String()) + return &provider.ResourceInfo{}, errtypes.PartialContent(req.Ref.String()) } uploadInfo.info.Storage["InternalDestination"] = p @@ -81,14 +81,14 @@ func (fs *cephfs) Upload(ctx context.Context, req storage.UploadRequest, uff sto req.Body, err = cv.mount.Open(assembledFile, os.O_RDONLY, 0) }) if err != nil { - return provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error opening assembled file") + return &provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error opening assembled file") } defer req.Body.Close() defer user.op(func(cv *cacheVal) { _ = cv.mount.Unlink(assembledFile) }) } - ri := provider.ResourceInfo{ + ri := &provider.ResourceInfo{ // fill with at least fileid, mtime and etag Id: &provider.ResourceId{ StorageId: uploadInfo.info.MetaData["providerID"], @@ -103,7 +103,7 @@ func (fs *cephfs) Upload(ctx context.Context, req storage.UploadRequest, uff sto } if _, err := uploadInfo.WriteChunk(ctx, 0, req.Body); err != nil { - return provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error writing to binary file") + return &provider.ResourceInfo{}, errors.Wrap(err, "cephfs: error writing to binary file") } return ri, uploadInfo.FinishUpload(ctx)