From 518ffe6364135e80853fb6a2b7b60d25df6d984b Mon Sep 17 00:00:00 2001
From: Bel LaPointe <breel@qualtrics.com>
Date: Thu, 6 Feb 2020 12:08:27 -0700
Subject: [PATCH] Update minio and fix s3 access

---
 cli/main.go | 7 ++++++-
 minio.go    | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cli/main.go b/cli/main.go
index 6000a26..41f5f95 100755
--- a/cli/main.go
+++ b/cli/main.go
@@ -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())
diff --git a/minio.go b/minio.go
index 336495c..8a0bff3 100755
--- a/minio.go
+++ b/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
 }