Update minio and fix s3 access

master
Bel LaPointe 2020-02-06 12:08:27 -07:00
parent 428218f45f
commit 518ffe6364
2 changed files with 13 additions and 2 deletions

View File

@ -20,6 +20,7 @@ func main() {
as.Append(args.STRING, "do", "[get set]", "get") as.Append(args.STRING, "do", "[get set]", "get")
as.Append(args.STRING, "k", "key", "key") as.Append(args.STRING, "k", "key", "key")
as.Append(args.STRING, "v", "value", "value") as.Append(args.STRING, "v", "value", "value")
as.Append(args.STRING, "ns", "namespace", "")
if err := as.Parse(); err != nil { if err := as.Parse(); err != nil {
panic(err) panic(err)
} }
@ -39,7 +40,11 @@ func main() {
switch strings.ToLower(as.Get("do").GetString()) { switch strings.ToLower(as.Get("do").GetString()) {
case "list": case "list":
var c []string 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)) b = []byte(fmt.Sprintf("%v", c))
case "get": case "get":
b, err = db.Get(as.Get("k").GetString()) b, err = db.Get(as.Get("k").GetString())

View File

@ -3,6 +3,7 @@ package storage
import ( import (
"bytes" "bytes"
"io/ioutil" "io/ioutil"
"net/url"
"strings" "strings"
minio "github.com/minio/minio-go" minio "github.com/minio/minio-go"
@ -13,7 +14,12 @@ type Minio struct {
} }
func NewMinio(addr, user, pass string) (*Minio, error) { 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 return &Minio{db: db}, err
} }