Merge pull request #531 from restic/update-minio-go

Update minio-go

src/restic/backend/s3/s3.go

@@ -27,7 +27,7 @@ type s3 struct {
 func Open(cfg Config) (backend.Backend, error) {
 	debug.Log("s3.Open", "open, config %#v", cfg)
 
-	client, err := minio.New(cfg.Endpoint, cfg.KeyID, cfg.Secret, cfg.UseHTTP)
+	client, err := minio.New(cfg.Endpoint, cfg.KeyID, cfg.Secret, !cfg.UseHTTP)
 	if err != nil {
 		return nil, err
 	}

vendor/manifest

@@ -28,7 +28,7 @@
 		{
 			"importpath": "github.com/minio/minio-go",
 			"repository": "https://github.com/minio/minio-go",
-			"revision": "867b27701ad16db4a9f4dad40d28187ca8433ec9",
+			"revision": "a8babf4220d5dd7240d011bdb7be567b439460f9",
 			"branch": "master"
 		},
 		{

vendor/src/github.com/minio/minio-go/API.md

@@ -12,7 +12,8 @@ import (
 )
 
 func main() {
-    s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
+    secure := true // Make HTTPS requests by default.
+    s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", secure)
     if err !!= nil {
         fmt.Println(err)
         return
@@ -446,7 +447,7 @@ if err != nil {
 ### Presigned operations
 ---------------------------------------
 <a name="PresignedGetObject">
-#### PresignedGetObject(bucketName, objectName string, expiry time.Duration, reqParams url.Values) error
+#### PresignedGetObject(bucketName, objectName string, expiry time.Duration, reqParams url.Values) (*url.URL, error)
 Generate a presigned URL for GET.
 
 __Parameters__
@@ -471,7 +472,7 @@ if err != nil {
 
 ---------------------------------------
 <a name="PresignedPutObject">
-#### PresignedPutObject(bucketName string, objectName string, expiry time.Duration) (string, error)
+#### PresignedPutObject(bucketName string, objectName string, expiry time.Duration) (*url.URL, error)
 Generate a presigned URL for PUT.
 <blockquote>
 NOTE: you can upload to S3 only with specified object name.
@@ -494,7 +495,7 @@ if err != nil {
 
 ---------------------------------------
 <a name="PresignedPostPolicy">
-#### PresignedPostPolicy(policy PostPolicy) (map[string]string, error)
+#### PresignedPostPolicy(policy PostPolicy) (*url.URL, map[string]string, error)
 PresignedPostPolicy we can provide policies specifying conditions restricting
 what you want to allow in a POST request, such as bucket name where objects can be
 uploaded, key name prefixes that you want to allow for the object being created and more.
@@ -517,7 +518,7 @@ policy.SetContentLengthRange(1024, 1024*1024)
 ```
 Get the POST form key/value object:
 ```go
-formData, err := s3Client.PresignedPostPolicy(policy)
+url, formData, err := s3Client.PresignedPostPolicy(policy)
 if err != nil {
     fmt.Println(err)
     return
@@ -531,5 +532,5 @@ for k, v := range m {
     fmt.Printf("-F %s=%s ", k, v)
 }
 fmt.Printf("-F file=@/etc/bash.bashrc ")
-fmt.Printf("https://my-bucketname.s3.amazonaws.com\n")
+fmt.Printf("%s\n", url)
 ```

vendor/src/github.com/minio/minio-go/README.md

@@ -40,12 +40,13 @@ import (
 )
 
 func main() {
-	// Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
+	// Requests are always secure (HTTPS) by default. Set secure=false to enable insecure (HTTP) access.
 	// This boolean value is the last argument for New().
 
 	// New returns an Amazon S3 compatible client object. API copatibality (v2 or v4) is automatically
 	// determined based on the Endpoint value.
-	s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESS-KEY-HERE", "YOUR-SECRET-KEY-HERE", false)
+    secure := true // Defaults to HTTPS requests.
+	s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESS-KEY-HERE", "YOUR-SECRET-KEY-HERE", secure)
 	if err != nil {
 	    log.Fatalln(err)
 	}
@@ -85,9 +86,9 @@ func main() {
 * [FGetObject(bucketName, objectName, filePath) error](examples/s3/fgetobject.go)
 
 ### Presigned Operations.
-* [PresignedGetObject(bucketName, objectName, time.Duration, url.Values) (string, error)](examples/s3/presignedgetobject.go)
-* [PresignedPutObject(bucketName, objectName, time.Duration) (string, error)](examples/s3/presignedputobject.go)
-* [PresignedPostPolicy(NewPostPolicy()) (map[string]string, error)](examples/s3/presignedpostpolicy.go)
+* [PresignedGetObject(bucketName, objectName, time.Duration, url.Values) (*url.URL, error)](examples/s3/presignedgetobject.go)
+* [PresignedPutObject(bucketName, objectName, time.Duration) (*url.URL, error)](examples/s3/presignedputobject.go)
+* [PresignedPostPolicy(NewPostPolicy()) (*url.URL, map[string]string, error)](examples/s3/presignedpostpolicy.go)
 
 ### Bucket Policy Operations.
 * [SetBucketPolicy(bucketName, objectPrefix, BucketPolicy) error](examples/s3/setbucketpolicy.go)

vendor/src/github.com/minio/minio-go/api-error-response.go

@@ -223,3 +223,13 @@ func ErrInvalidArgument(message string) error {
 		RequestID: "minio",
 	}
 }
+
+// ErrNoSuchBucketPolicy - No Such Bucket Policy response
+// The specified bucket does not have a bucket policy.
+func ErrNoSuchBucketPolicy(message string) error {
+	return ErrorResponse{
+		Code:      "NoSuchBucketPolicy",
+		Message:   message,
+		RequestID: "minio",
+	}
+}

vendor/src/github.com/minio/minio-go/api-get-object.go

@@ -59,6 +59,9 @@ func (c Client) GetObject(bucketName, objectName string) (*Object, error) {
 			select {
 			// When the done channel is closed exit our routine.
 			case <-doneCh:
+				// Close the http response body before returning.
+				// This ends the connection with the server.
+				httpReader.Close()
 				return
 			// Request message.
 			case req := <-reqCh:

vendor/src/github.com/minio/minio-go/api-list.go

@@ -77,7 +77,7 @@ func (c Client) ListBuckets() ([]BucketInfo, error) {
 //
 func (c Client) ListObjects(bucketName, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan ObjectInfo {
 	// Allocate new list objects channel.
-	objectStatCh := make(chan ObjectInfo)
+	objectStatCh := make(chan ObjectInfo, 1)
 	// Default listing is delimited at "/"
 	delimiter := "/"
 	if recursive {
@@ -254,7 +254,7 @@ func (c Client) ListIncompleteUploads(bucketName, objectPrefix string, recursive
 // listIncompleteUploads lists all incomplete uploads.
 func (c Client) listIncompleteUploads(bucketName, objectPrefix string, recursive, aggregateSize bool, doneCh <-chan struct{}) <-chan ObjectMultipartInfo {
 	// Allocate channel for multipart uploads.
-	objectMultipartStatCh := make(chan ObjectMultipartInfo)
+	objectMultipartStatCh := make(chan ObjectMultipartInfo, 1)
 	// Delimiter is set to "/" by default.
 	delimiter := "/"
 	if recursive {

vendor/src/github.com/minio/minio-go/api-presigned.go

@@ -33,19 +33,19 @@ var supportedGetReqParams = map[string]struct{}{
 
 // presignURL - Returns a presigned URL for an input 'method'.
 // Expires maximum is 7days - ie. 604800 and minimum is 1.
-func (c Client) presignURL(method string, bucketName string, objectName string, expires time.Duration, reqParams url.Values) (urlStr string, err error) {
+func (c Client) presignURL(method string, bucketName string, objectName string, expires time.Duration, reqParams url.Values) (u *url.URL, err error) {
 	// Input validation.
 	if method == "" {
-		return "", ErrInvalidArgument("method cannot be empty.")
+		return nil, ErrInvalidArgument("method cannot be empty.")
 	}
 	if err := isValidBucketName(bucketName); err != nil {
-		return "", err
+		return nil, err
 	}
 	if err := isValidObjectName(objectName); err != nil {
-		return "", err
+		return nil, err
 	}
 	if err := isValidExpiry(expires); err != nil {
-		return "", err
+		return nil, err
 	}
 
 	// Convert expires into seconds.
@@ -63,7 +63,7 @@ func (c Client) presignURL(method string, bucketName string, objectName string,
 		// Verify if input map has unsupported params, if yes exit.
 		for k := range reqParams {
 			if _, ok := supportedGetReqParams[k]; !ok {
-				return "", ErrInvalidArgument(k + " unsupported request parameter for presigned GET.")
+				return nil, ErrInvalidArgument(k + " unsupported request parameter for presigned GET.")
 			}
 		}
 		// Save the request parameters to be used in presigning for
@@ -75,43 +75,48 @@ func (c Client) presignURL(method string, bucketName string, objectName string,
 	// Since expires is set newRequest will presign the request.
 	req, err := c.newRequest(method, reqMetadata)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
-	return req.URL.String(), nil
+	return req.URL, nil
 }
 
 // PresignedGetObject - Returns a presigned URL to access an object
 // without credentials. Expires maximum is 7days - ie. 604800 and
 // minimum is 1. Additionally you can override a set of response
 // headers using the query parameters.
-func (c Client) PresignedGetObject(bucketName string, objectName string, expires time.Duration, reqParams url.Values) (url string, err error) {
+func (c Client) PresignedGetObject(bucketName string, objectName string, expires time.Duration, reqParams url.Values) (u *url.URL, err error) {
 	return c.presignURL("GET", bucketName, objectName, expires, reqParams)
 }
 
 // PresignedPutObject - Returns a presigned URL to upload an object without credentials.
 // Expires maximum is 7days - ie. 604800 and minimum is 1.
-func (c Client) PresignedPutObject(bucketName string, objectName string, expires time.Duration) (url string, err error) {
+func (c Client) PresignedPutObject(bucketName string, objectName string, expires time.Duration) (u *url.URL, err error) {
 	return c.presignURL("PUT", bucketName, objectName, expires, nil)
 }
 
-// PresignedPostPolicy - Returns POST form data to upload an object at a location.
-func (c Client) PresignedPostPolicy(p *PostPolicy) (map[string]string, error) {
+// PresignedPostPolicy - Returns POST urlString, form data to upload an object.
+func (c Client) PresignedPostPolicy(p *PostPolicy) (u *url.URL, formData map[string]string, err error) {
 	// Validate input arguments.
 	if p.expiration.IsZero() {
-		return nil, errors.New("Expiration time must be specified")
+		return nil, nil, errors.New("Expiration time must be specified")
 	}
 	if _, ok := p.formData["key"]; !ok {
-		return nil, errors.New("object key must be specified")
+		return nil, nil, errors.New("object key must be specified")
 	}
 	if _, ok := p.formData["bucket"]; !ok {
-		return nil, errors.New("bucket name must be specified")
+		return nil, nil, errors.New("bucket name must be specified")
 	}
 
 	bucketName := p.formData["bucket"]
 	// Fetch the bucket location.
 	location, err := c.getBucketLocation(bucketName)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
+	}
+
+	u, err = c.makeTargetURL(bucketName, "", location, nil)
+	if err != nil {
+		return nil, nil, err
 	}
 
 	// Keep time.
@@ -129,7 +134,7 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (map[string]string, error) {
 		}
 		// Sign the policy.
 		p.formData["signature"] = postPresignSignatureV2(policyBase64, c.secretAccessKey)
-		return p.formData, nil
+		return u, p.formData, nil
 	}
 
 	// Add date policy.
@@ -138,7 +143,7 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (map[string]string, error) {
 		condition: "$x-amz-date",
 		value:     t.Format(iso8601DateFormat),
 	}); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// Add algorithm policy.
@@ -147,7 +152,7 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (map[string]string, error) {
 		condition: "$x-amz-algorithm",
 		value:     signV4Algorithm,
 	}); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// Add a credential policy.
@@ -157,7 +162,7 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (map[string]string, error) {
 		condition: "$x-amz-credential",
 		value:     credential,
 	}); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// Get base64 encoded policy.
@@ -168,5 +173,5 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (map[string]string, error) {
 	p.formData["x-amz-credential"] = credential
 	p.formData["x-amz-date"] = t.Format(iso8601DateFormat)
 	p.formData["x-amz-signature"] = postPresignSignatureV4(policyBase64, t, c.secretAccessKey, location)
-	return p.formData, nil
+	return u, p.formData, nil
 }

vendor/src/github.com/minio/minio-go/api-put-bucket.go

@@ -26,6 +26,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"reflect"
 )
 
 /// Bucket operations
@@ -166,14 +167,22 @@ func (c Client) SetBucketPolicy(bucketName string, objectPrefix string, bucketPo
 		return nil
 	}
 	// Remove any previous policies at this path.
-	policy.Statements = removeBucketPolicyStatement(policy.Statements, bucketName, objectPrefix)
+	statements := removeBucketPolicyStatement(policy.Statements, bucketName, objectPrefix)
 
 	// generating []Statement for the given bucketPolicy.
-	statements, err := generatePolicyStatement(bucketPolicy, bucketName, objectPrefix)
+	generatedStatements, err := generatePolicyStatement(bucketPolicy, bucketName, objectPrefix)
 	if err != nil {
 		return err
 	}
-	policy.Statements = append(policy.Statements, statements...)
+	statements = append(statements, generatedStatements...)
+
+	// No change in the statements indicates an attempt of setting 'none' on a prefix
+	// which doesn't have a pre-existing policy.
+	if reflect.DeepEqual(policy.Statements, statements) {
+		return ErrNoSuchBucketPolicy(fmt.Sprintf("No policy exists on %s/%s", bucketName, objectPrefix))
+	}
+
+	policy.Statements = statements
 	// Save the updated policies.
 	return c.putBucketPolicy(bucketName, policy)
 }

vendor/src/github.com/minio/minio-go/api-put-object-multipart.go

@@ -42,7 +42,7 @@ import (
 // is where each part is re-downloaded, checksummed and verified
 // before upload.
 func (c Client) putObjectMultipart(bucketName, objectName string, reader io.Reader, size int64, contentType string, progress io.Reader) (n int64, err error) {
-	if size > 0 && size >= minPartSize {
+	if size > 0 && size > minPartSize {
 		// Verify if reader is *os.File, then use file system functionalities.
 		if isFile(reader) {
 			return c.putObjectMultipartFromFile(bucketName, objectName, reader.(*os.File), size, contentType, progress)