Merge pull request #6 from ckiosidis/avoid-double-write-to-gcs

combine write and update to one request

google/container.go

@@ -114,17 +114,25 @@ func (c *Container) Put(name string, r io.Reader, size int64, metadata map[strin
 	}
 
 	w := obj.NewWriter(c.ctx)
+	w.ObjectAttrs.Metadata = merge(w.ObjectAttrs.Metadata, mdPrepped)
 	if _, err := io.Copy(w, r); err != nil {
 		return nil, err
 	}
-	w.Close()
-
-	attr, err := obj.Update(c.ctx, storage.ObjectAttrsToUpdate{Metadata: mdPrepped})
-	if err != nil {
+	if err = w.Close(); err != nil {
 		return nil, err
 	}
 
-	return c.convertToStowItem(attr)
+	return c.convertToStowItem(w.Attrs())
+}
+
+func merge(metadata ...map[string]string) map[string]string {
+	res := map[string]string{}
+	for _, mt := range metadata {
+		for k, v := range mt {
+			res[k] = v
+		}
+	}
+	return res
 }
 
 func (c *Container) convertToStowItem(attr *storage.ObjectAttrs) (stow.Item, error) {