Don't throw an error on a missing folder in localfs (#95)

Co-authored-by: Erin Pentecost <erin.pentecost@lytics.com>
lytics · Jul 20, 2021 · 33be8f2 · 33be8f2
1 parent 1c8a12f
commit 33be8f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/localfs/store.go b/localfs/store.go
@@ -197,7 +197,7 @@ func (l *LocalStore) Objects(ctx context.Context, csq cloudstorage.Query) (cloud
 func (l *LocalStore) Folders(ctx context.Context, csq cloudstorage.Query) ([]string, error) {
 	spath := path.Join(l.storepath, csq.Prefix)
 	if !cloudstorage.Exists(spath) {
-		return nil, fmt.Errorf("That folder %q does not exist", spath)
+		return []string{}, nil
 	}
 	select {
 	case <-ctx.Done():

diff --git a/testutils/testutils.go b/testutils/testutils.go
@@ -643,6 +643,16 @@ func ListObjsAndFolders(t TestingT, store cloudstorage.Store) {
 	folders, err = store.Folders(ctx, q)
 	assert.NotEqual(t, nil, err)
 	assert.Equal(t, 0, len(folders), "incorrect list len. wanted 0 folders. %v", folders)
+
+	// List objects from a missing folder
+	q = cloudstorage.NewQuery("does-not-exist/")
+	resp, err := store.List(context.Background(), q)
+	assert.NoError(t, err)
+	assert.NotNil(t, resp)
+	assert.Empty(t, resp.Objects)
+	folders, err = store.Folders(context.Background(), q)
+	assert.NoError(t, err)
+	assert.Empty(t, folders)
 }
 
 func Truncate(t TestingT, store cloudstorage.Store) {