account for an s3 folder when listing objects (#3807) (#3813)

* account for an s3 folder when listing objects

account for an s3 folder when listing objects (#3807) (#3813)
6c39336a · Brian Downs · GitHub · a13c952b · 6c39336a
Unverified Commit 6c39336a authored Aug 09, 2021 by Brian Downs Committed by GitHub Aug 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

etcd.go pkg/etcd/etcd.go +9 -1

No files found.
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -900,7 +900,15 @@ func (e *ETCD) listSnapshots(ctx context.Context, snapshotDir string) ([]Snapsho
 			return nil, err
 		}

-		objects := e.s3.client.ListObjects(ctx, e.config.EtcdS3BucketName, minio.ListObjectsOptions{})
+		var loo minio.ListObjectsOptions
+		if e.config.EtcdS3Folder != "" {
+			loo = minio.ListObjectsOptions{
+				Prefix:    e.config.EtcdS3Folder,
+				Recursive: true,
+			}
+		}
+
+		objects := e.s3.client.ListObjects(ctx, e.config.EtcdS3BucketName, loo)

 		for obj := range objects {
 			if obj.Err != nil {