Recursion as default for s3 List op, PrefixFolders to disable

Author: nvaatstra

backends/s3/s3.go

@@ -55,8 +55,9 @@ type Options struct {
 	// seamlessly
 	GlobalPrefix string `yaml:"global_prefix"`
 
-	// Recursive can be enabled to make List operations recurse into nested prefixes
-	Recursive bool `yaml:"recursive"`
+	// PrefixFolders can be enabled to make List operations show nested prefixes as folders
+	// instead of recursively listing all contents of nested prefixes
+	PrefixFolders bool `yaml:"prefix_folders"`
 
 	// EndpointURL can be set to something like "http://localhost:9000" when using Minio
 	// or "https://s3.amazonaws.com" for AWS S3.
@@ -165,7 +166,7 @@ func (b *Backend) doList(ctx context.Context, prefix string) (simpleblob.BlobLis
 
 	objCh := b.client.ListObjects(ctx, b.opt.Bucket, minio.ListObjectsOptions{
 		Prefix:    prefix,
-		Recursive: b.opt.Recursive,
+		Recursive: !b.opt.PrefixFolders,
 	})
 	for obj := range objCh {
 		// Handle error returned by MinIO client

backends/s3/s3_test.go

@@ -132,24 +132,24 @@ func TestBackend_recursive(t *testing.T) {
 	err = b.Store(ctx, "foo/bar-3", []byte("bar3"))
 	assert.NoError(t, err)
 
-	// List all - no recursion (default)
+	// List all - PrefixFolders disabled (default)
 	ls, err = b.List(ctx, "")
 	assert.NoError(t, err)
-	assert.Equal(t, ls.Names(), []string{"bar-1", "bar-2", "foo/"})
+	assert.Equal(t, ls.Names(), []string{"bar-1", "bar-2", "foo/bar-3"})
 
-	// List all - recursive enabled
-	b.opt.Recursive = true
+	// List all - PrefixFolders enabled
+	b.opt.PrefixFolders = true
 
 	ls, err = b.List(ctx, "")
 	assert.NoError(t, err)
-	assert.Equal(t, ls.Names(), []string{"bar-1", "bar-2", "foo/bar-3"})
+	assert.Equal(t, ls.Names(), []string{"bar-1", "bar-2", "foo/"})
 
-	// List all - recursive disabled
-	b.opt.Recursive = false
+	// List all - PrefixFolders disabled
+	b.opt.PrefixFolders = false
 
 	ls, err = b.List(ctx, "")
 	assert.NoError(t, err)
-	assert.Equal(t, ls.Names(), []string{"bar-1", "bar-2", "foo/"})
+	assert.Equal(t, ls.Names(), []string{"bar-1", "bar-2", "foo/bar-3"})
 
 	assert.Len(t, b.lastMarker, 0)
 }