"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
* s3: fix error mapping in GetObject to match HeadObject
lewoberstc1df24f14227
diff --git a/backend/s3/s3.go b/backend/s3/s3.goindex 490aac221..f03c8074b 100644--- a/backend/s3/s3.go+++ b/backend/s3/s3.go@@ -4361,6 +4361,9 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (in io.Read}}if err != nil {+ if statusCode := getHTTPStatusCode(err); statusCode == http.StatusNotFound || statusCode == http.StatusMethodNotAllowed {+ return nil, fs.ErrorObjectNotFound+ }return nil, err}diff --git a/backend/s3/s3_test.go b/backend/s3/s3_test.goindex 316fd79fd..d4d4fb84b 100644--- a/backend/s3/s3_test.go+++ b/backend/s3/s3_test.go@@ -12,6 +12,8 @@ import ("github.com/rclone/rclone/fs""github.com/rclone/rclone/fstest""github.com/rclone/rclone/fstest/fstests"+ "github.com/rclone/rclone/lib/bucket"+ "github.com/rclone/rclone/lib/pacer""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")@@ -129,6 +131,57 @@ func TestClientStopsAfterTenRedirects(t *testing.T) {assert.Contains(t, err.Error(), "stopped after 10 redirects")}+func TestObjectNotFoundMapping(t *testing.T) {+ ctx, opt, client := SetupS3Test(t)+ gotHead, gotGet := false, false++ // Return 404 for all requests.+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ switch r.Method {+ case http.MethodHead:+ gotHead = true+ case http.MethodGet:+ gotGet = true+ }+ w.WriteHeader(http.StatusNotFound)+ }))+ defer server.Close()++ opt.Endpoint = server.URL+ opt.ForcePathStyle = true+ opt.Region = "us-east-1"+ opt.AccessKeyID = "id"+ opt.SecretAccessKey = "secret"+ c, _, err := s3Connection(ctx, opt, client)+ require.NoError(t, err)++ f := &Fs{+ name: "s3test",+ opt: *opt,+ ctx: ctx,+ c: c,+ pacer: fs.NewPacer(ctx, pacer.NewS3(pacer.MinSleep(minSleep))),+ cache: bucket.NewCache(),+ }+ f.setRoot("bucket")++ // HEAD path: NewObject reads metadata via HeadObject.+ _, headErr := f.NewObject(ctx, "missing.txt")+ require.True(t, gotHead, "server should have received a HEAD request")+ assert.ErrorIs(t, headErr, fs.ErrorObjectNotFound)++ // GET path: Object.Open issues a GetObject.+ o := &Object{fs: f, remote: "missing.txt"}+ in, getErr := o.Open(ctx)+ if in != nil {+ _ = in.Close()+ }+ require.True(t, gotGet, "server should have received a GET request")+ assert.ErrorIs(t, getErr, fs.ErrorObjectNotFound)++ assert.Equal(t, headErr, getErr, "HeadObject and GetObject should map a 404 to the same error")+}+// TestIntegration runs integration tests against the remotefunc TestIntegration(t *testing.T) {opt := &fstests.Opt{