Stowage/rest-server
2
0
Fork 0
mirror of https://github.com/restic/rest-server.git synced 2025-10-19 15:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

return empty array if there are no objects to list

Browse source 
Previously "null" was returned, which does not match the REST backend
specification.
This commit is contained in:
Michael Eischer 2023-06-16 21:52:50 +02:00
parent ab45fb59ff
commit 84a8b210f5
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
handlers_test.go
View file

@ -379,6 +379,30 @@ func TestResticErrorHandler(t *testing.T) {
}
}
func TestEmptyList(t *testing.T) {
mux, _, _, _, cleanup := createTestHandler(t, Server{
AppendOnly: true,
NoAuth: true,
Debug: true,
})
defer cleanup()
// create the repo
checkRequest(t, mux.ServeHTTP,
newRequest(t, "POST", "/?create=true", nil),
[]wantFunc{wantCode(http.StatusOK)})
for i := 1; i <= 2; i++ {
req := newRequest(t, "GET", "/data/", nil)
if i == 2 {
req.Header.Set("Accept", "application/vnd.x.restic.rest.v2")
}
checkRequest(t, mux.ServeHTTP, req,
[]wantFunc{wantCode(http.StatusOK), wantBody("[]")})
}
}
func TestListWithUnexpectedFiles(t *testing.T) {
mux, _, _, tempdir, cleanup := createTestHandler(t, Server{
AppendOnly: true,

4
repo/repo.go
View file

@ -375,7 +375,7 @@ func (h *Handler) listBlobsV1(w http.ResponseWriter, r *http.Request) {
return
}
var names []string
names := []string{}
for _, i := range items {
if isHashed(objectType) {
if !i.IsDir() {
@ -434,7 +434,7 @@ func (h *Handler) listBlobsV2(w http.ResponseWriter, r *http.Request) {
return
}
var blobs []Blob
blobs := []Blob{}
for _, i := range items {
if isHashed(objectType) {
if !i.IsDir() {