Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set prefix, delimiter params even when empty #1064

Merged
merged 1 commit into from Jan 20, 2019
Merged

Set prefix, delimiter params even when empty #1064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 19 additions & 24 deletions api-list.go
View file
Open in desktop
Expand Up @@ -192,18 +192,16 @@ func (c Client) listObjectsV2Query(bucketName, objectPrefix, continuationToken s
// Always set list-type in ListObjects V2
urlValues.Set("list-type", "2")

// Set object prefix.
if objectPrefix != "" {
urlValues.Set("prefix", objectPrefix)
}
// Set object prefix, prefix value to be set to empty is okay.
urlValues.Set("prefix", objectPrefix)

// Set delimiter, delimiter value to be set to empty is okay.
urlValues.Set("delimiter", delimiter)

// Set continuation token
if continuationToken != "" {
urlValues.Set("continuation-token", continuationToken)
}
// Set delimiter.
if delimiter != "" {
urlValues.Set("delimiter", delimiter)
}

// Fetch owner when listing
if fetchOwner {
Expand Down Expand Up @@ -380,18 +378,17 @@ func (c Client) listObjectsQuery(bucketName, objectPrefix, objectMarker, delimit
// Get resources properly escaped and lined up before
// using them in http request.
urlValues := make(url.Values)
// Set object prefix.
if objectPrefix != "" {
urlValues.Set("prefix", objectPrefix)
}

// Set object prefix, prefix value to be set to empty is okay.
urlValues.Set("prefix", objectPrefix)

// Set delimiter, delimiter value to be set to empty is okay.
urlValues.Set("delimiter", delimiter)

// Set object marker.
if objectMarker != "" {
urlValues.Set("marker", objectMarker)
}
// Set delimiter.
if delimiter != "" {
urlValues.Set("delimiter", delimiter)
}

// maxkeys should default to 1000 or less.
if maxkeys == 0 || maxkeys > 1000 {
Expand Down Expand Up @@ -563,14 +560,12 @@ func (c Client) listMultipartUploadsQuery(bucketName, keyMarker, uploadIDMarker,
if uploadIDMarker != "" {
urlValues.Set("upload-id-marker", uploadIDMarker)
}
// Set prefix marker.
if prefix != "" {
urlValues.Set("prefix", prefix)
}
// Set delimiter.
if delimiter != "" {
urlValues.Set("delimiter", delimiter)
}

// Set object prefix, prefix value to be set to empty is okay.
urlValues.Set("prefix", prefix)

// Set delimiter, delimiter value to be set to empty is okay.
urlValues.Set("delimiter", delimiter)

// maxUploads should be 1000 or less.
if maxUploads == 0 || maxUploads > 1000 {
Expand Down