Merge pull request #70 from ljfranklin/PR-gcs-multipart

Sidestep multipart upload failures on GCS

s3client.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -152,6 +153,11 @@ func (client *s3client) BucketFileVersions(bucketName string, remotePath string)
 func (client *s3client) UploadFile(bucketName string, remotePath string, localPath string, options UploadFileOptions) (string, error) {
 	uploader := s3manager.NewUploader(client.session)
 
+	if client.isGCSHost() {
+		// GCS returns `InvalidArgument` on multipart uploads
+		uploader.MaxUploadParts = 1
+	}
+
 	stat, err := os.Stat(localPath)
 	if err != nil {
 		return "", err
@@ -411,3 +417,7 @@ func (client *s3client) newProgressBar(total int64) *pb.ProgressBar {
 
 	return progress.SetWidth(80)
 }
+
+func (client *s3client) isGCSHost() bool {
+	return (client.session.Config.Endpoint != nil && strings.Contains(*client.session.Config.Endpoint, "storage.googleapis.com"))
+}