bump s3cli to support gcs

Author: cppforlife

deps.txt

@@ -17,10 +17,12 @@ github.com/hashicorp/go-multierror:d30f099
 github.com/jessevdk/go-flags:4cc2832
 github.com/mattn/go-isatty:56b76bd
 github.com/mattn/go-colorable:e8a10dd
-github.com/aws/aws-sdk-go:665c623
 github.com/go-ini/ini:12f418c
 github.com/jmespath/go-jmespath:0b12d6b
 github.com/charlievieth/fs/...:1c3b3f1
 github.com/hashicorp/errwrap/...:7554cd9
 github.com/bmatcuk/doublestar/...:044df0a
 github.com/cppforlife/go-patch/patch:661a67c
+github.com/pivotal-golang/s3cli:90561c0
+github.com/golang/protobuf/proto:98fa357
+github.com/aws/aws-sdk-go:1a651d9

releasedir/s3_blobstore.go

@@ -8,7 +8,8 @@ import (
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
 	boshuuid "github.com/cloudfoundry/bosh-utils/uuid"
-	s3client "github.com/cppforlife/s3cli/client"
+	s3client "github.com/pivotal-golang/s3cli/client"
+	s3config "github.com/pivotal-golang/s3cli/config"
 )
 
 type S3Blobstore struct {
@@ -95,7 +96,17 @@ func (b S3Blobstore) client() (s3client.S3Blobstore, error) {
 		return s3client.S3Blobstore{}, bosherr.WrapErrorf(err, "Marshaling config")
 	}
 
-	client, err := s3client.New(gobytes.NewBuffer(bytes))
+	conf, err := s3config.NewFromReader(gobytes.NewBuffer(bytes))
+	if err != nil {
+		return s3client.S3Blobstore{}, bosherr.WrapErrorf(err, "Reading config")
+	}
+
+	s3ClientSDK, err := s3client.NewSDK(conf)
+	if err != nil {
+		return s3client.S3Blobstore{}, bosherr.WrapErrorf(err, "Building client SDK")
+	}
+
+	client, err := s3client.New(s3ClientSDK, &conf)
 	if err != nil {
 		return s3client.S3Blobstore{}, bosherr.WrapErrorf(err, "Validating config")
 	}