Implement Write for AWS S3 and Google Cloud Storage objects

Also use a context for S3 get object requests.

Signed-off-by: Michael Smith <[email protected]>

plugin/aws/s3Object.go

@@ -1,6 +1,7 @@
 package aws
 
 import (
+	"bytes"
 	"context"
 	"io/ioutil"
 	"strconv"
@@ -78,7 +79,7 @@ func (o *s3Object) Read(ctx context.Context, size int64, offset int64) ([]byte,
 		Range:  awsSDK.String("bytes=" + strconv.FormatInt(offset, 10) + "-" + strconv.FormatInt(offset+size, 10)),
 	}
 
-	resp, err := o.client.GetObject(request)
+	resp, err := o.client.GetObjectWithContext(ctx, request)
 	if err != nil {
 		return nil, err
 	}
@@ -88,9 +89,26 @@ func (o *s3Object) Read(ctx context.Context, size int64, offset int64) ([]byte,
 		}
 	}()
 
+	activity.Record(ctx, "S3 object read response: %+v", *resp)
 	return ioutil.ReadAll(resp.Body)
 }
 
+func (o *s3Object) Write(ctx context.Context, p []byte) error {
+	request := &s3Client.PutObjectInput{
+		Bucket: awsSDK.String(o.bucket),
+		Key:    awsSDK.String(o.key),
+		Body:   bytes.NewReader(p),
+	}
+
+	resp, err := o.client.PutObjectWithContext(ctx, request)
+	if err != nil {
+		return err
+	}
+
+	activity.Record(ctx, "S3 object write response: %+v", *resp)
+	return nil
+}
+
 func (o *s3Object) Delete(ctx context.Context) (bool, error) {
 	_, err := o.client.DeleteObjectWithContext(ctx, &s3Client.DeleteObjectInput{
 		Bucket: aws.String(o.bucket),

plugin/gcp/storageObject.go

@@ -45,6 +45,17 @@ func (s *storageObject) Read(ctx context.Context, size int64, offset int64) ([]b
 	return ioutil.ReadAll(rdr)
 }
 
+func (s *storageObject) Write(ctx context.Context, p []byte) error {
+	wr := s.ObjectHandle.NewWriter(ctx)
+	if _, err := wr.Write(p); err != nil {
+		wr.Close()
+		return err
+	}
+
+	// When Close fails we can assume the object update failed.
+	return wr.Close()
+}
+
 func (s *storageObject) Delete(ctx context.Context) (bool, error) {
 	err := s.ObjectHandle.Delete(ctx)
 	return true, err