Update minio and fix s3 access
parent
428218f45f
commit
518ffe6364
|
|
@ -20,6 +20,7 @@ func main() {
|
|||
as.Append(args.STRING, "do", "[get set]", "get")
|
||||
as.Append(args.STRING, "k", "key", "key")
|
||||
as.Append(args.STRING, "v", "value", "value")
|
||||
as.Append(args.STRING, "ns", "namespace", "")
|
||||
if err := as.Parse(); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
|
@ -39,7 +40,11 @@ func main() {
|
|||
switch strings.ToLower(as.Get("do").GetString()) {
|
||||
case "list":
|
||||
var c []string
|
||||
c, err = db.List(nil, as.Get("k").GetString())
|
||||
var ns []string
|
||||
if nss := as.Get("ns").GetString(); len(ns) > 0 {
|
||||
ns = []string{nss}
|
||||
}
|
||||
c, err = db.List(ns, as.Get("k").GetString())
|
||||
b = []byte(fmt.Sprintf("%v", c))
|
||||
case "get":
|
||||
b, err = db.Get(as.Get("k").GetString())
|
||||
|
|
|
|||
8
minio.go
8
minio.go
|
|
@ -3,6 +3,7 @@ package storage
|
|||
import (
|
||||
"bytes"
|
||||
"io/ioutil"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
minio "github.com/minio/minio-go"
|
||||
|
|
@ -13,7 +14,12 @@ type Minio struct {
|
|||
}
|
||||
|
||||
func NewMinio(addr, user, pass string) (*Minio, error) {
|
||||
db, err := minio.New(addr, user, pass, strings.HasPrefix(addr, "https://"))
|
||||
url, err := url.Parse(addr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
addr = strings.TrimPrefix(addr, url.Scheme+"://")
|
||||
db, err := minio.New(addr, user, pass, url.Scheme == "https")
|
||||
return &Minio{db: db}, err
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue