From 9dea7020f0e2c7ab287fc199941aa617ce9b9bbc Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 18 Nov 2020 12:03:16 -0800 Subject: [PATCH] allow prefix filtering for WalkDir to be optional (#10923) --- cmd/metacache-walk.go | 2 +- cmd/storage-rest-server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/metacache-walk.go b/cmd/metacache-walk.go index a1b260f2c..9aa2e8a03 100644 --- a/cmd/metacache-walk.go +++ b/cmd/metacache-walk.go @@ -258,12 +258,12 @@ func (s *storageRESTServer) WalkDirHandler(w http.ResponseWriter, r *http.Reques vars := mux.Vars(r) volume := vars[storageRESTVolume] dirPath := vars[storageRESTDirPath] - prefix := vars[storageRESTPrefixFilter] recursive, err := strconv.ParseBool(vars[storageRESTRecursive]) if err != nil { s.writeErrorResponse(w, err) return } + prefix := r.URL.Query().Get(storageRESTPrefixFilter) writer := streamHTTPResponse(w) writer.CloseWithError(s.storage.WalkDir(r.Context(), WalkDirOptions{ Bucket: volume, diff --git a/cmd/storage-rest-server.go b/cmd/storage-rest-server.go index c76292441..d99ae555e 100644 --- a/cmd/storage-rest-server.go +++ b/cmd/storage-rest-server.go @@ -1083,7 +1083,7 @@ func registerStorageRESTHandlers(router *mux.Router, endpointServerSets Endpoint subrouter.Methods(http.MethodPost).Path(storageRESTVersionPrefix + storageRESTMethodVerifyFile).HandlerFunc(httpTraceHdrs(server.VerifyFileHandler)). Queries(restQueries(storageRESTVolume, storageRESTFilePath)...) subrouter.Methods(http.MethodPost).Path(storageRESTVersionPrefix + storageRESTMethodWalkDir).HandlerFunc(httpTraceHdrs(server.WalkDirHandler)). - Queries(restQueries(storageRESTVolume, storageRESTDirPath, storageRESTRecursive, storageRESTPrefixFilter)...) + Queries(restQueries(storageRESTVolume, storageRESTDirPath, storageRESTRecursive)...) } } }