From 14e852ee9dbfe57ceeff05f32e59018d9e39afc7 Mon Sep 17 00:00:00 2001
From: Ole Frost <82263101+olefrost@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:12:00 +0100
Subject: [PATCH] s3: fix incorrect tier support for StorJ and IDrive when
 pointing at a file

Fixes #6734
---
 backend/s3/s3.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/backend/s3/s3.go b/backend/s3/s3.go
index 14bfdbdcd..75a477a9e 100644
--- a/backend/s3/s3.go
+++ b/backend/s3/s3.go
@@ -2989,6 +2989,15 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
 		GetTier:           true,
 		SlowModTime:       true,
 	}).Fill(ctx, f)
+	if opt.Provider == "Storj" {
+		f.features.SetTier = false
+		f.features.GetTier = false
+	}
+	if opt.Provider == "IDrive" {
+		f.features.SetTier = false
+	}
+	// f.listMultipartUploads()
+
 	if f.rootBucket != "" && f.rootDirectory != "" && !opt.NoHeadObject && !strings.HasSuffix(root, "/") {
 		// Check to see if the (bucket,directory) is actually an existing file
 		oldRoot := f.root
@@ -3003,14 +3012,6 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
 		// return an error with an fs which points to the parent
 		return f, fs.ErrorIsFile
 	}
-	if opt.Provider == "Storj" {
-		f.features.SetTier = false
-		f.features.GetTier = false
-	}
-	if opt.Provider == "IDrive" {
-		f.features.SetTier = false
-	}
-	// f.listMultipartUploads()
 	return f, nil
 }