Updates for new MinIO version

rstudio · Jul 31, 2023 · 8c75434 · 8c75434
1 parent 2918b19
commit 8c75434
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
@@ -40,12 +40,15 @@ services:
 
   minio:
     image: minio/minio
+    ports:
+      - "9000:9000"
+      - "9001:9001"
     expose:
       - "9000"
     environment:
       MINIO_ACCESS_KEY: minio
       MINIO_SECRET_KEY: miniokey
-    command: minio server /data
+    command: minio server /data --console-address ":9001"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
       interval: 30s

diff --git a/pkg/rsstorage/servers/s3server/s3_service.go b/pkg/rsstorage/servers/s3server/s3_service.go
@@ -184,7 +184,7 @@ func (s *defaultS3Wrapper) MoveObject(bucket, oldKey, newBucket, newKey string)
 func (s *defaultS3Wrapper) ListObjects(bucket, prefix string) ([]string, error) {
 	ops := NewAwsOps(s.session)
 	// prefix must end with a slash
-	if !strings.HasSuffix(prefix, "/") {
+	if prefix != "" && !strings.HasSuffix(prefix, "/") {
 		prefix += "/"
 	}
 	return ops.BucketObjects(bucket, prefix, S3Concurrency, true, nil)