WIP: Allow prefix listing without directory delimiter

objstore.go

@@ -107,9 +107,14 @@ func WithRecursiveIter(params *IterParams) {
 	params.Recursive = true
 }
 
+func WithoutApendingDirDelim(params *IterParams) {
+	params.WithoutAppendDirDelim = true
+}
+
 // IterParams holds the Iter() parameters and is used by objstore clients implementations.
 type IterParams struct {
-	Recursive bool
+	Recursive             bool
+	WithoutAppendDirDelim bool
 }
 
 func ApplyIterOptions(options ...IterOption) IterParams {

providers/azure/azure.go

@@ -183,12 +183,15 @@ func NewBucketWithConfig(logger log.Logger, conf Config, component string) (*Buc
 // Iter calls f for each entry in the given directory. The argument to f is the full
 // object name including the prefix of the inspected directory.
 func (b *Bucket) Iter(ctx context.Context, dir string, f func(string) error, options ...objstore.IterOption) error {
+	params := objstore.ApplyIterOptions(options...)
+
+	// Ensure the object name actually ends with a dir suffix, as long as this
+	// is not explicitly disabled by the WithoutAppendDirDelim.
 	prefix := dir
-	if prefix != "" && !strings.HasSuffix(prefix, DirDelim) {
+	if prefix != "" && !strings.HasSuffix(prefix, DirDelim) && !params.WithoutAppendDirDelim {
 		prefix += DirDelim
 	}
 
-	params := objstore.ApplyIterOptions(options...)
 	if params.Recursive {
 		opt := &container.ListBlobsFlatOptions{Prefix: &prefix}
 		pager := b.containerClient.NewListBlobsFlatPager(opt)

providers/gcs/gcs.go

@@ -94,15 +94,17 @@ func (b *Bucket) Name() string {
 // Iter calls f for each entry in the given directory. The argument to f is the full
 // object name including the prefix of the inspected directory.
 func (b *Bucket) Iter(ctx context.Context, dir string, f func(string) error, options ...objstore.IterOption) error {
-	// Ensure the object name actually ends with a dir suffix. Otherwise we'll just iterate the
-	// object itself as one prefix item.
-	if dir != "" {
+	params := objstore.ApplyIterOptions(options...)
+
+	// Ensure the object name actually ends with a dir suffix, as long as this
+	// is not explicitly disabled by the WithoutAppendDirDelim.
+	if dir != "" && !params.WithoutAppendDirDelim {
 		dir = strings.TrimSuffix(dir, DirDelim) + DirDelim
 	}
 
 	// If recursive iteration is enabled we should pass an empty delimiter.
 	delimiter := DirDelim
-	if objstore.ApplyIterOptions(options...).Recursive {
+	if params.Recursive {
 		delimiter = ""
 	}
 

providers/s3/s3.go

@@ -385,15 +385,17 @@ func ValidateForTests(conf Config) error {
 // Iter calls f for each entry in the given directory. The argument to f is the full
 // object name including the prefix of the inspected directory.
 func (b *Bucket) Iter(ctx context.Context, dir string, f func(string) error, options ...objstore.IterOption) error {
-	// Ensure the object name actually ends with a dir suffix. Otherwise we'll just iterate the
-	// object itself as one prefix item.
-	if dir != "" {
+	params := objstore.ApplyIterOptions(options...)
+
+	// Ensure the object name actually ends with a dir suffix, as long as this
+	// is not explicitly disabled by the WithoutAppendDirDelim.
+	if dir != "" && !params.WithoutAppendDirDelim {
 		dir = strings.TrimSuffix(dir, DirDelim) + DirDelim
 	}
 
 	opts := minio.ListObjectsOptions{
 		Prefix:    dir,
-		Recursive: objstore.ApplyIterOptions(options...).Recursive,
+		Recursive: params.Recursive,
 		UseV1:     b.listObjectsV1,
 	}