set delimiter when it is not empty string (#3273)

juicedata · Mar 1, 2023 · c33e760 · c33e760
1 parent 7460443
commit c33e760
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/pkg/object/ibmcos.go b/pkg/object/ibmcos.go
@@ -143,9 +143,11 @@ func (s *ibmcos) List(prefix, marker, delimiter string, limit int64) ([]Object,
 		Prefix:       &prefix,
 		Marker:       &marker,
 		MaxKeys:      &limit,
-		Delimiter:    &delimiter,
 		EncodingType: aws.String("url"),
 	}
+	if delimiter != "" {
+		param.Delimiter = &delimiter
+	}
 	resp, err := s.s3.ListObjects(&param)
 	if err != nil {
 		return nil, err

diff --git a/pkg/object/ks3.go b/pkg/object/ks3.go
@@ -148,9 +148,11 @@ func (s *ks3) List(prefix, marker, delimiter string, limit int64) ([]Object, err
 		Prefix:       &prefix,
 		Marker:       &marker,
 		MaxKeys:      &limit,
-		Delimiter:    &delimiter,
 		EncodingType: aws.String("url"),
 	}
+	if delimiter != "" {
+		param.Delimiter = &delimiter
+	}
 	resp, err := s.s3.ListObjects(&param)
 	if err != nil {
 		return nil, err

diff --git a/pkg/object/qingstor.go b/pkg/object/qingstor.go
@@ -167,10 +167,12 @@ func (q *qingstor) List(prefix, marker, delimiter string, limit int64) ([]Object
 	}
 	limit_ := int(limit)
 	input := &qs.ListObjectsInput{
-		Prefix:    &prefix,
-		Marker:    &marker,
-		Limit:     &limit_,
-		Delimiter: &delimiter,
+		Prefix: &prefix,
+		Marker: &marker,
+		Limit:  &limit_,
+	}
+	if delimiter != "" {
+		input.Delimiter = &delimiter
 	}
 	out, err := q.bucket.ListObjects(input)
 	if err != nil {

diff --git a/pkg/object/s3.go b/pkg/object/s3.go
@@ -177,9 +177,11 @@ func (s *s3client) List(prefix, marker, delimiter string, limit int64) ([]Object
 		Prefix:       &prefix,
 		Marker:       &marker,
 		MaxKeys:      &limit,
-		Delimiter:    &delimiter,
 		EncodingType: aws.String("url"),
 	}
+	if delimiter != "" {
+		param.Delimiter = &delimiter
+	}
 	resp, err := s.s3.ListObjects(&param)
 	if err != nil {
 		return nil, err