dashboard / erock/pico / chore(pobj.fs): feature parity with minio #66 rss

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/pkg/pobj/storage/fs.go b/pkg/pobj/storage/fs.go
index ab6b3c4..21e3329 100644
--- a/pkg/pobj/storage/fs.go
+++ b/pkg/pobj/storage/fs.go
@@ -97,7 +97,6 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA
 	objInfo := &ObjectInfo{
 		LastModified: time.Time{},
 		Metadata:     nil,
-		UserMetadata: map[string]string{},
 	}
 
 	dat, err := os.Open(filepath.Join(bucket.Path, fpath))

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/pkg/pobj/storage/memory.go b/pkg/pobj/storage/memory.go
index 1fa43c9..5542aee 100644
--- a/pkg/pobj/storage/memory.go
+++ b/pkg/pobj/storage/memory.go
@@ -87,7 +87,6 @@ func (s *StorageMemory) GetObject(bucket Bucket, fpath string) (utils.ReadAndRea
 	objInfo := &ObjectInfo{
 		LastModified: time.Time{},
 		Metadata:     nil,
-		UserMetadata: map[string]string{},
 	}
 
 	dat, ok := s.storage[bucket.Path][fpath]

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/pkg/pobj/storage/minio.go b/pkg/pobj/storage/minio.go
index 3e3509b..d7f310e 100644
--- a/pkg/pobj/storage/minio.go
+++ b/pkg/pobj/storage/minio.go
@@ -200,7 +200,6 @@ func (s *StorageMinio) GetObject(bucket Bucket, fpath string) (utils.ReadAndRead
 	objInfo.LastModified = info.LastModified
 	objInfo.ETag = info.ETag
 	objInfo.Metadata = info.Metadata
-	objInfo.UserMetadata = info.UserMetadata
 	objInfo.Size = info.Size
 
 	if mtime, ok := info.UserMetadata["Mtime"]; ok {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10

diff --git a/pkg/pobj/storage/storage.go b/pkg/pobj/storage/storage.go
index 6054e8b..f33d6e0 100644
--- a/pkg/pobj/storage/storage.go
+++ b/pkg/pobj/storage/storage.go
@@ -33,5 +33,4 @@ type ObjectInfo struct {
 	LastModified time.Time
 	ETag         string
 	Metadata     http.Header
-	UserMetadata map[string]string
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22

diff --git a/pkg/apps/pgs/calc_route.go b/pkg/apps/pgs/calc_route.go
index 2387e4c..351139b 100644
--- a/pkg/apps/pgs/calc_route.go
+++ b/pkg/apps/pgs/calc_route.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/picosh/pico/pkg/send/utils"
 	"github.com/picosh/pico/pkg/shared"
-	"github.com/picosh/pico/pkg/shared/storage"
+	"github.com/picosh/pico/pkg/shared/mime"
 )
 
 type HttpReply struct {
@@ -23,7 +23,7 @@ func expandRoute(projectName, fp string, status int) []*HttpReply {
 	if fp == "" {
 		fp = "/"
 	}
-	mimeType := storage.GetMimeType(fp)
+	mimeType := mime.GetMimeType(fp)
 	fname := filepath.Base(fp)
 	fdir := filepath.Dir(fp)
 	fext := filepath.Ext(fp)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88

diff --git a/pkg/shared/mime/mime.go b/pkg/shared/mime/mime.go
new file mode 100644
index 0000000..e5ee81f
--- /dev/null
+++ b/pkg/shared/mime/mime.go
@@ -0,0 +1,82 @@
+package mime
+
+import "path/filepath"
+
+func GetMimeType(fpath string) string {
+	ext := filepath.Ext(fpath)
+	if ext == ".svg" {
+		return "image/svg+xml"
+	} else if ext == ".css" {
+		return "text/css"
+	} else if ext == ".js" {
+		return "text/javascript"
+	} else if ext == ".ico" {
+		return "image/x-icon"
+	} else if ext == ".pdf" {
+		return "application/pdf"
+	} else if ext == ".html" || ext == ".htm" {
+		return "text/html"
+	} else if ext == ".jpg" || ext == ".jpeg" {
+		return "image/jpeg"
+	} else if ext == ".png" {
+		return "image/png"
+	} else if ext == ".gif" {
+		return "image/gif"
+	} else if ext == ".webp" {
+		return "image/webp"
+	} else if ext == ".otf" {
+		return "font/otf"
+	} else if ext == ".woff" {
+		return "font/woff"
+	} else if ext == ".woff2" {
+		return "font/woff2"
+	} else if ext == ".ttf" {
+		return "font/ttf"
+	} else if ext == ".md" {
+		return "text/markdown; charset=UTF-8"
+	} else if ext == ".json" || ext == ".map" {
+		return "application/json"
+	} else if ext == ".rss" {
+		return "application/rss+xml"
+	} else if ext == ".atom" {
+		return "application/atom+xml"
+	} else if ext == ".webmanifest" {
+		return "application/manifest+json"
+	} else if ext == ".xml" {
+		return "application/xml"
+	} else if ext == ".xsl" {
+		return "application/xml"
+	} else if ext == ".avif" {
+		return "image/avif"
+	} else if ext == ".heif" {
+		return "image/heif"
+	} else if ext == ".heic" {
+		return "image/heif"
+	} else if ext == ".opus" {
+		return "audio/opus"
+	} else if ext == ".wav" {
+		return "audio/wav"
+	} else if ext == ".mp3" {
+		return "audio/mpeg"
+	} else if ext == ".mp4" {
+		return "video/mp4"
+	} else if ext == ".mpeg" {
+		return "video/mpeg"
+	} else if ext == ".wasm" {
+		return "application/wasm"
+	} else if ext == ".opml" {
+		return "text/x-opml"
+	} else if ext == ".eot" {
+		return "application/vnd.ms-fontobject"
+	} else if ext == ".yml" || ext == ".yaml" {
+		return "text/x-yaml"
+	} else if ext == ".zip" {
+		return "application/zip"
+	} else if ext == ".rar" {
+		return "application/vnd.rar"
+	} else if ext == ".txt" {
+		return "text/plain"
+	}
+
+	return "text/plain"
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21

diff --git a/pkg/shared/storage/fs.go b/pkg/shared/storage/fs.go
index 04068df..0c75fcc 100644
--- a/pkg/shared/storage/fs.go
+++ b/pkg/shared/storage/fs.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	sst "github.com/picosh/pico/pkg/pobj/storage"
+	"github.com/picosh/pico/pkg/shared/mime"
 )
 
 type StorageFS struct {
@@ -28,7 +29,7 @@ func (s *StorageFS) ServeObject(bucket sst.Bucket, fpath string, opts *ImgProces
 	var rc io.ReadCloser
 	info := &sst.ObjectInfo{}
 	var err error
-	mimeType := GetMimeType(fpath)
+	mimeType := mime.GetMimeType(fpath)
 	if !strings.HasPrefix(mimeType, "image/") || opts == nil || os.Getenv("IMGPROXY_URL") == "" {
 		rc, info, err = s.GetObject(bucket, fpath)
 		if info.Metadata == nil {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21

diff --git a/pkg/shared/storage/memory.go b/pkg/shared/storage/memory.go
index 350fa13..7c3df6e 100644
--- a/pkg/shared/storage/memory.go
+++ b/pkg/shared/storage/memory.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	sst "github.com/picosh/pico/pkg/pobj/storage"
+	"github.com/picosh/pico/pkg/shared/mime"
 )
 
 type StorageMemory struct {
@@ -32,7 +33,7 @@ func (s *StorageMemory) ServeObject(bucket sst.Bucket, fpath string, opts *ImgPr
 	if info.ETag == "" {
 		info.ETag = "static-etag-for-testing-purposes"
 	}
-	mimeType := GetMimeType(fpath)
+	mimeType := mime.GetMimeType(fpath)
 	info.Metadata.Set("content-type", mimeType)
 	return obj, info, err
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21

diff --git a/pkg/shared/storage/minio.go b/pkg/shared/storage/minio.go
index 8d242a5..5826fe6 100644
--- a/pkg/shared/storage/minio.go
+++ b/pkg/shared/storage/minio.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	sst "github.com/picosh/pico/pkg/pobj/storage"
+	"github.com/picosh/pico/pkg/shared/mime"
 )
 
 type StorageMinio struct {
@@ -27,7 +28,7 @@ func (s *StorageMinio) ServeObject(bucket sst.Bucket, fpath string, opts *ImgPro
 	var rc io.ReadCloser
 	info := &sst.ObjectInfo{}
 	var err error
-	mimeType := GetMimeType(fpath)
+	mimeType := mime.GetMimeType(fpath)
 	if !strings.HasPrefix(mimeType, "image/") || opts == nil || os.Getenv("IMGPROXY_URL") == "" {
 		rc, info, err = s.GetObject(bucket, fpath)
 		if info.Metadata == nil {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98

diff --git a/pkg/shared/storage/proxy.go b/pkg/shared/storage/proxy.go
index a3a2c51..811cc25 100644
--- a/pkg/shared/storage/proxy.go
+++ b/pkg/shared/storage/proxy.go
@@ -10,7 +10,6 @@ import (
 	"log/slog"
 	"net/http"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -18,85 +17,6 @@ import (
 	"github.com/picosh/pico/pkg/pobj/storage"
 )
 
-func GetMimeType(fpath string) string {
-	ext := filepath.Ext(fpath)
-	if ext == ".svg" {
-		return "image/svg+xml"
-	} else if ext == ".css" {
-		return "text/css"
-	} else if ext == ".js" {
-		return "text/javascript"
-	} else if ext == ".ico" {
-		return "image/x-icon"
-	} else if ext == ".pdf" {
-		return "application/pdf"
-	} else if ext == ".html" || ext == ".htm" {
-		return "text/html"
-	} else if ext == ".jpg" || ext == ".jpeg" {
-		return "image/jpeg"
-	} else if ext == ".png" {
-		return "image/png"
-	} else if ext == ".gif" {
-		return "image/gif"
-	} else if ext == ".webp" {
-		return "image/webp"
-	} else if ext == ".otf" {
-		return "font/otf"
-	} else if ext == ".woff" {
-		return "font/woff"
-	} else if ext == ".woff2" {
-		return "font/woff2"
-	} else if ext == ".ttf" {
-		return "font/ttf"
-	} else if ext == ".md" {
-		return "text/markdown; charset=UTF-8"
-	} else if ext == ".json" || ext == ".map" {
-		return "application/json"
-	} else if ext == ".rss" {
-		return "application/rss+xml"
-	} else if ext == ".atom" {
-		return "application/atom+xml"
-	} else if ext == ".webmanifest" {
-		return "application/manifest+json"
-	} else if ext == ".xml" {
-		return "application/xml"
-	} else if ext == ".xsl" {
-		return "application/xml"
-	} else if ext == ".avif" {
-		return "image/avif"
-	} else if ext == ".heif" {
-		return "image/heif"
-	} else if ext == ".heic" {
-		return "image/heif"
-	} else if ext == ".opus" {
-		return "audio/opus"
-	} else if ext == ".wav" {
-		return "audio/wav"
-	} else if ext == ".mp3" {
-		return "audio/mpeg"
-	} else if ext == ".mp4" {
-		return "video/mp4"
-	} else if ext == ".mpeg" {
-		return "video/mpeg"
-	} else if ext == ".wasm" {
-		return "application/wasm"
-	} else if ext == ".opml" {
-		return "text/x-opml"
-	} else if ext == ".eot" {
-		return "application/vnd.ms-fontobject"
-	} else if ext == ".yml" || ext == ".yaml" {
-		return "text/x-yaml"
-	} else if ext == ".zip" {
-		return "application/zip"
-	} else if ext == ".rar" {
-		return "application/vnd.rar"
-	} else if ext == ".txt" {
-		return "text/plain"
-	}
-
-	return "text/plain"
-}
-
 func UriToImgProcessOpts(uri string) (*ImgProcessOpts, error) {
 	opts := &ImgProcessOpts{}
 	parts := strings.Split(uri, "/")

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

diff --git a/pkg/pobj/storage/fs.go b/pkg/pobj/storage/fs.go
index 21e3329..15ddd76 100644
--- a/pkg/pobj/storage/fs.go
+++ b/pkg/pobj/storage/fs.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"io/fs"
 	"log/slog"
+	"net/http"
 	"os"
 	"path"
 	"path/filepath"
@@ -12,6 +13,7 @@ import (
 	"time"
 
 	"github.com/picosh/pico/pkg/send/utils"
+	"github.com/picosh/pico/pkg/shared/mime"
 )
 
 // https://stackoverflow.com/a/32482941
@@ -96,7 +98,7 @@ func (s *StorageFS) DeleteBucket(bucket Bucket) error {
 func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderAtCloser, *ObjectInfo, error) {
 	objInfo := &ObjectInfo{
 		LastModified: time.Time{},
-		Metadata:     nil,
+		Metadata:     make(http.Header),
 	}
 
 	dat, err := os.Open(filepath.Join(bucket.Path, fpath))
@@ -111,6 +113,7 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA
 
 	objInfo.Size = info.Size()
 	objInfo.LastModified = info.ModTime()
+	objInfo.Metadata.Set("content-type", mime.GetMimeType(fpath))
 	return dat, objInfo, nil
 }
 
@@ -147,6 +150,10 @@ func (s *StorageFS) DeleteObject(bucket Bucket, fpath string) error {
 		return err
 	}
 
+	// try to remove dir if it is empty
+	dir := filepath.Dir(loc)
+	_ = os.Remove(dir)
+
 	return nil
 }
 

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

diff --git a/pkg/pobj/storage/fs.go b/pkg/pobj/storage/fs.go
index 15ddd76..842ce62 100644
--- a/pkg/pobj/storage/fs.go
+++ b/pkg/pobj/storage/fs.go
@@ -76,7 +76,7 @@ func (s *StorageFS) UpsertBucket(name string) (Bucket, error) {
 		return bucket, nil
 	}
 
-	dir := filepath.Join(s.Dir, bucket.Path)
+	dir := filepath.Join(s.Dir, name)
 	s.Logger.Info("bucket not found, creating", "dir", dir, "err", err)
 	err = os.MkdirAll(dir, os.ModePerm)
 	if err != nil {
@@ -91,6 +91,8 @@ func (s *StorageFS) GetBucketQuota(bucket Bucket) (uint64, error) {
 	return uint64(dsize), err
 }
 
+// DeleteBucket will delete all contents regardless if files exist inside of it.
+// This is different from minio impl which requires all files be deleted first.
 func (s *StorageFS) DeleteBucket(bucket Bucket) error {
 	return os.RemoveAll(bucket.Path)
 }
@@ -150,15 +152,34 @@ func (s *StorageFS) DeleteObject(bucket Bucket, fpath string) error {
 		return err
 	}
 
-	// try to remove dir if it is empty
+	// traverse up the folder tree and remove all empty folders
 	dir := filepath.Dir(loc)
-	_ = os.Remove(dir)
+	for dir != "" {
+		err = os.Remove(dir)
+		if err != nil {
+			break
+		}
+		fp := strings.Split(dir, "/")
+		dir = "/" + filepath.Join(fp[:len(fp)-1]...)
+	}
 
 	return nil
 }
 
 func (s *StorageFS) ListBuckets() ([]string, error) {
-	return []string{}, fmt.Errorf("not implemented")
+	entries, err := os.ReadDir(s.Dir)
+	if err != nil {
+		return []string{}, err
+	}
+
+	buckets := []string{}
+	for _, e := range entries {
+		if !e.IsDir() {
+			continue
+		}
+		buckets = append(buckets, e.Name())
+	}
+	return buckets, nil
 }
 
 func (s *StorageFS) ListObjects(bucket Bucket, dir string, recursive bool) ([]os.FileInfo, error) {

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223

diff --git a/pkg/shared/storage/fs_test.go b/pkg/shared/storage/fs_test.go
new file mode 100644
index 0000000..ee935c6
--- /dev/null
+++ b/pkg/shared/storage/fs_test.go
@@ -0,0 +1,217 @@
+package storage
+
+import (
+	"io"
+	"io/fs"
+	"log/slog"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/picosh/pico/pkg/send/utils"
+)
+
+func TestFsAdapter(t *testing.T) {
+	logger := slog.Default()
+	f, err := os.MkdirTemp("", "fs-tests-")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(f)
+
+	st, err := NewStorageFS(logger, f)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	bucketName := "main"
+	// create bucket
+	bucket, err := st.UpsertBucket(bucketName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// ensure bucket exists
+	file, err := os.Stat(bucket.Path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !file.IsDir() {
+		t.Fatal("bucket must be directory")
+	}
+
+	bucketCheck, err := st.GetBucket(bucketName)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if bucketCheck.Path != bucket.Path || bucketCheck.Name != bucket.Name {
+		t.Fatal("upsert and get bucket incongruent")
+	}
+
+	modTime := time.Now()
+
+	str := "here is a test file"
+	reader := strings.NewReader(str)
+	actualPath, size, err := st.PutObject(bucket, "./nice/test.txt", reader, &utils.FileEntry{
+		Mtime: modTime.Unix(),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if size != int64(len(str)) {
+		t.Fatalf("size, actual: %d, expected: %d", size, int64(len(str)))
+	}
+	expectedPath := filepath.Join(bucket.Path, "nice", "test.txt")
+	if actualPath != expectedPath {
+		t.Fatalf("path, actual: %s, expected: %s", actualPath, expectedPath)
+	}
+
+	// ensure file exists
+	_, err = os.Stat(expectedPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// get file
+	r, info, err := st.GetObject(bucket, "nice/test.txt")
+	if err != nil {
+		t.Fatal(err)
+	}
+	buf := new(strings.Builder)
+	_, err = io.Copy(buf, r)
+	if err != nil {
+		t.Fatal(err)
+	}
+	actualStr := buf.String()
+	if actualStr != str {
+		t.Fatalf("contents, actual: %s, expected: %s", actualStr, str)
+	}
+	if info.Size != size {
+		t.Fatalf("size, actual: %d, expected: %d", size, info.Size)
+	}
+
+	str = "a deeply nested test file"
+	reader = strings.NewReader(str)
+	_, _, err = st.PutObject(bucket, "./here/we/go/again.txt", reader, &utils.FileEntry{
+		Mtime: modTime.Unix(),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// list objects
+	objs, err := st.ListObjects(bucket, "/", true)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expectedObjs := []fs.FileInfo{
+		&utils.VirtualFile{
+			FName:  "main",
+			FIsDir: true,
+			FSize:  80,
+		},
+		&utils.VirtualFile{
+			FName:  "here",
+			FIsDir: true,
+			FSize:  60,
+		},
+		&utils.VirtualFile{
+			FName:  "we",
+			FIsDir: true,
+			FSize:  60,
+		},
+		&utils.VirtualFile{
+			FName:  "go",
+			FIsDir: true,
+			FSize:  60,
+		},
+		&utils.VirtualFile{FName: "again.txt", FSize: 25},
+		&utils.VirtualFile{
+			FName:  "nice",
+			FIsDir: true,
+			FSize:  60,
+		},
+		&utils.VirtualFile{FName: "test.txt", FSize: 19},
+	}
+	ignore := cmpopts.IgnoreFields(utils.VirtualFile{}, "FModTime")
+	if cmp.Equal(objs, expectedObjs, ignore) == false {
+		//nolint
+		t.Fatal(cmp.Diff(objs, expectedObjs, ignore))
+	}
+
+	// list buckets
+	aBucket, _ := st.UpsertBucket("another")
+	_, _ = st.UpsertBucket("and-another")
+	buckets, err := st.ListBuckets()
+	if err != nil {
+		t.Fatal(err)
+	}
+	expectedBuckets := []string{"and-another", "another", "main"}
+	if cmp.Equal(buckets, expectedBuckets) == false {
+		//nolint
+		t.Fatal(cmp.Diff(buckets, expectedBuckets))
+	}
+
+	// delete bucket
+	err = st.DeleteBucket(aBucket)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// ensure bucket was actually deleted
+	_, err = os.Stat(aBucket.Path)
+	if !os.IsNotExist(err) {
+		t.Fatal("directory should have been deleted")
+	}
+
+	err = st.DeleteObject(bucket, "nice/test.txt")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// ensure file was actually deleted
+	_, err = os.Stat(filepath.Join(bucket.Path, "nice/test.txt"))
+	if !os.IsNotExist(err) {
+		t.Fatal("file should have been deleted")
+	}
+
+	// ensure containing folder was also deleted
+	_, err = os.Stat(filepath.Join(bucket.Path, "nice"))
+	if !os.IsNotExist(err) {
+		t.Fatal("containing folder should have been deleted")
+	}
+
+	str = "a deeply nested test file"
+	reader = strings.NewReader(str)
+	_, _, err = st.PutObject(bucket, "./here/yes/we/can.txt", reader, &utils.FileEntry{
+		Mtime: modTime.Unix(),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// delete deeply nested file and all parent folders that are now empty
+	err = st.DeleteObject(bucket, "here/yes/we/can.txt")
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = os.Stat(filepath.Join(bucket.Path, "here"))
+	if os.IsNotExist(err) {
+		t.Fatal("this folder had multiple files and should not have been deleted")
+	}
+	_, err = os.Stat(filepath.Join(bucket.Path, "here/yes"))
+	if !os.IsNotExist(err) {
+		t.Fatal("containing folder should have been deleted")
+	}
+
+	// delete bucket even with file contents
+	err = st.DeleteBucket(bucket)
+	if err != nil {
+		t.Fatal(err)
+	}
+}