Skip to content

Commit 8ee6f76

Browse files
author
Keerthan Mala
committed
remove the minio-go dependency
1 parent 2be38d5 commit 8ee6f76

4 files changed

Lines changed: 10 additions & 14 deletions

File tree

glide.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import:
2020
- log
2121
- time
2222
- package: github.com/kelseyhightower/envconfig
23-
- package: github.com/minio/minio-go
2423
- package: github.com/pborman/uuid
2524
- package: golang.org/x/crypto
2625
subpackages:

pkg/healthsrv/buckets_lister.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package healthsrv
22

3+
<<<<<<< a4e52011cd181ce189cb2b6d24a3c3a03275015b
34
import (
45
s3 "github.com/minio/minio-go"
56
)
@@ -13,16 +14,16 @@ type BucketLister interface {
1314

1415
type emptyBucketLister struct{}
1516

16-
func (e emptyBucketLister) ListBuckets() ([]s3.BucketInfo, error) {
17-
return nil, nil
17+
func (e emptyBucketLister) ListBuckets() (bool, error) {
18+
return true, nil
1819
}
1920

2021
type errBucketLister struct {
2122
err error
2223
}
2324

24-
func (e errBucketLister) ListBuckets() ([]s3.BucketInfo, error) {
25-
return nil, e.err
25+
func (e errBucketLister) ListBuckets() (bool, error) {
26+
return true, e.err
2627
}
2728

2829
// listBuckets calls bl.ListBuckets(...) and sends the results back on the various given channels.

pkg/storage/object.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ const (
2323
func ObjectExists(storageDriver storagedriver.StorageDriver, objKey string) (bool, error) {
2424
_, err := storageDriver.Stat(objKey)
2525
if err != nil {
26-
minioErr := s3.ToErrorResponse(err)
27-
if minioErr.Code == noSuchKeyCode {
28-
return false, nil
29-
}
30-
return false, err
26+
return false, nil
3127
}
3228
return true, nil
3329
}

0 commit comments

Comments
 (0)