Skip to content

Commit 377eb13

Browse files
fix: omit empty filter in http list object request (#13434)
1 parent 945efa9 commit 377eb13

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

storage/http_client.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,11 @@ func (c *httpStorageClient) ListObjects(ctx context.Context, bucket string, q *Q
365365
req.IncludeTrailingDelimiter(it.query.IncludeTrailingDelimiter)
366366
req.MatchGlob(it.query.MatchGlob)
367367
req.IncludeFoldersAsPrefixes(it.query.IncludeFoldersAsPrefixes)
368-
req.Filter(it.query.Filter)
368+
369+
// Cannot pass empty filter
370+
if it.query.Filter != "" {
371+
req.Filter(it.query.Filter)
372+
}
369373

370374
if selection := it.query.toFieldSelection(); selection != "" {
371375
req.Fields("nextPageToken", googleapi.Field(selection))

storage/integration_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7306,6 +7306,13 @@ func TestIntegration_ObjectGetListCustomContexts(t *testing.T) {
73067306
},
73077307
expectedNames: []string{object1Name},
73087308
},
7309+
{
7310+
name: "NoFilter",
7311+
query: &Query{
7312+
Prefix: prefix,
7313+
},
7314+
expectedNames: []string{object1Name, object2Name, object3Name},
7315+
},
73097316
}
73107317

73117318
for _, tc := range filterTests {

0 commit comments

Comments
 (0)