Merge lp:~surma/goamz/put-headers into lp:goamz

[Alexander Surma]

Sorry for taking so long, work has kept me quite busy :)

https://bugs.launchpad.net/goamz/+bug/1321254

[Dimiter Naydenov (dimitern)]

@surma can you re-propose this against http://github.com/go-amz/amz ?

Unmerged revisions

50. By Alexander Surma on 2014-08-25

s3: Add new PutReaderWithHeader method

      Related to bug report #1321254, a new method was added that supports
      setting arbitrary HTTP headers on PUT to allow things like cache-control.

=== modified file 's3/s3.go'
--- s3/s3.go	2014-02-12 13:42:33 +0000
+++ s3/s3.go	2014-08-25 08:09:26 +0000
@@ -79,8 +79,8 @@
 	return &Bucket{s3, name}
 }
 
-var createBucketConfiguration = `<CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> 
-  <LocationConstraint>%s</LocationConstraint> 
+var createBucketConfiguration = `<CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+  <LocationConstraint>%s</LocationConstraint>
 </CreateBucketConfiguration>`
 
 // locationConstraint returns an io.Reader specifying a LocationConstraint if
@@ -191,16 +191,22 @@
 // PutReader inserts an object into the S3 bucket by consuming data
 // from r until EOF.
 func (b *Bucket) PutReader(path string, r io.Reader, length int64, contType string, perm ACL) error {
-	headers := map[string][]string{
-		"Content-Length": {strconv.FormatInt(length, 10)},
-		"Content-Type":   {contType},
-		"x-amz-acl":      {string(perm)},
-	}
+	return b.PutReaderWithHeader(path, r, length, contType, perm, http.Header{})
+}
+
+// PutReader inserts an object into the S3 bucket by consuming data
+// from r until EOF. The HTTP PUT request will have the additional
+// headers provided. This is useful for cache control etc.
+func (b *Bucket) PutReaderWithHeader(path string, r io.Reader, length int64, contType string, perm ACL, hdrs http.Header) error {
+	hdrs.Set("Content-Length", strconv.FormatInt(length, 10))
+	hdrs.Set("Content-Type", contType)
+	hdrs.Set("x-amz-acl", string(perm))
+
 	req := &request{
 		method:  "PUT",
 		bucket:  b.Name,
 		path:    path,
-		headers: headers,
+		headers: hdrs,
 		payload: r,
 	}
 	return b.S3.query(req, nil)