Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

s3: fix storage class missing from --s3-versions listings

Dirk Petersene5eaf414f048
diff --git a/backend/s3/s3.go b/backend/s3/s3.go
index 778761748..36c1348bc 100644
--- a/backend/s3/s3.go
+++ b/backend/s3/s3.go
@@ -2425,6 +2425,8 @@ func (ls *versionsList) List(ctx context.Context) (resp *s3.ListObjectsV2Output,
var obj types.Object
//structs.SetFrom(obj, objVersion)
setFrom_typesObject_typesObjectVersion(&obj, &objVersion)
+ // StorageClass has a different type in ObjectVersion so isn't copied by setFrom
+ obj.StorageClass = types.ObjectStorageClass(objVersion.StorageClass)
// Adjust the file names
if !ls.usingVersionAt && (!deref(objVersion.IsLatest) || objVersion.Size == isDeleteMarker) {
if obj.Key != nil && objVersion.LastModified != nil {
diff --git a/backend/s3/s3_internal_test.go b/backend/s3/s3_internal_test.go
index 588729a59..4b5b93e89 100644
--- a/backend/s3/s3_internal_test.go
+++ b/backend/s3/s3_internal_test.go
@@ -9,6 +9,8 @@ import (
"errors"
"fmt"
"io"
+ "net/http"
+ "net/http/httptest"
"path"
"strings"
"testing"
@@ -332,6 +334,37 @@ func TestMergeDeleteMarkersWithURLEncodedKeys(t *testing.T) {
assert.Equal(t, want, got)
}
+func TestVersionsListStorageClass(t *testing.T) {
+ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ _, _ = io.WriteString(w, `<ListVersionsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+ <Name>bucket</Name>
+ <IsTruncated>false</IsTruncated>
+ <Version>
+ <Key>archived.bin</Key>
+ <VersionId>v1</VersionId>
+ <IsLatest>true</IsLatest>
+ <LastModified>2026-09-26T12:00:00.000Z</LastModified>
+ <ETag>"d41d8cd98f00b204e9800998ecf8427e"</ETag>
+ <Size>0</Size>
+ <StorageClass>DEEP_ARCHIVE</StorageClass>
+ </Version>
+</ListVersionsResult>`)
+ }))
+ defer srv.Close()
+
+ f := &Fs{c: s3.New(s3.Options{
+ Region: "us-east-1",
+ BaseEndpoint: aws.String(srv.URL),
+ UsePathStyle: true,
+ Credentials: aws.AnonymousCredentials{},
+ })}
+ ls := f.newVersionsList(&s3.ListObjectsV2Input{Bucket: aws.String("bucket")}, false, time.Time{})
+ resp, _, err := ls.List(context.Background())
+ require.NoError(t, err)
+ require.Len(t, resp.Contents, 1)
+ assert.Equal(t, types.ObjectStorageClassDeepArchive, resp.Contents[0].StorageClass)
+}
+
func TestRemoveAWSChunked(t *testing.T) {
ps := func(s string) *string {
return &s