From 9ea990d5a29fb74fbb28855577aa77e0e3c1ceb9 Mon Sep 17 00:00:00 2001 From: Mitsuo Heijo Date: Tue, 15 Dec 2020 00:37:27 +0900 Subject: [PATCH] azureblob: update azure-storage-blob-go to v0.12.0 See https://github.com/Azure/azure-storage-blob-go/blob/master/ChangeLog.md#version-0120 --- backend/azureblob/azureblob.go | 12 ++++++------ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/azureblob/azureblob.go b/backend/azureblob/azureblob.go index e454626e4..8be08eb27 100644 --- a/backend/azureblob/azureblob.go +++ b/backend/azureblob/azureblob.go @@ -1245,7 +1245,7 @@ func (f *Fs) Copy(ctx context.Context, src fs.Object, remote string) (fs.Object, copyStatus := startCopy.CopyStatus() for copyStatus == azblob.CopyStatusPending { time.Sleep(1 * time.Second) - getMetadata, err := dstBlobURL.GetProperties(ctx, options) + getMetadata, err := dstBlobURL.GetProperties(ctx, options, azblob.ClientProvidedKeyOptions{}) if err != nil { return nil, err } @@ -1396,7 +1396,7 @@ func (o *Object) readMetaData() (err error) { ctx := context.Background() var blobProperties *azblob.BlobGetPropertiesResponse err = o.fs.pacer.Call(func() (bool, error) { - blobProperties, err = blob.GetProperties(ctx, options) + blobProperties, err = blob.GetProperties(ctx, options, azblob.ClientProvidedKeyOptions{}) return o.fs.shouldRetry(err) }) if err != nil { @@ -1431,7 +1431,7 @@ func (o *Object) SetModTime(ctx context.Context, modTime time.Time) error { blob := o.getBlobReference() err := o.fs.pacer.Call(func() (bool, error) { - _, err := blob.SetMetadata(ctx, o.meta, azblob.BlobAccessConditions{}) + _, err := blob.SetMetadata(ctx, o.meta, azblob.BlobAccessConditions{}, azblob.ClientProvidedKeyOptions{}) return o.fs.shouldRetry(err) }) if err != nil { @@ -1474,7 +1474,7 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (in io.Read ac := azblob.BlobAccessConditions{} var downloadResponse *azblob.DownloadResponse err = o.fs.pacer.Call(func() (bool, error) { - downloadResponse, err = blob.Download(ctx, offset, count, ac, false) + downloadResponse, err = blob.Download(ctx, offset, count, ac, false, azblob.ClientProvidedKeyOptions{}) return o.fs.shouldRetry(err) }) if err != nil { @@ -1629,7 +1629,7 @@ func (o *Object) uploadMultipart(ctx context.Context, in io.Reader, size int64, bufferReader := bytes.NewReader(buf) wrappedReader := wrap(bufferReader) rs := readSeeker{wrappedReader, bufferReader} - _, err = blockBlobURL.StageBlock(ctx, blockID, &rs, ac, transactionalMD5) + _, err = blockBlobURL.StageBlock(ctx, blockID, &rs, ac, transactionalMD5, azblob.ClientProvidedKeyOptions{}) return o.fs.shouldRetry(err) }) if err != nil { @@ -1651,7 +1651,7 @@ func (o *Object) uploadMultipart(ctx context.Context, in io.Reader, size int64, // Finalise the upload session err = o.fs.pacer.Call(func() (bool, error) { - _, err := blockBlobURL.CommitBlockList(ctx, blocks, *httpHeaders, o.meta, azblob.BlobAccessConditions{}, azblob.AccessTierType(o.fs.opt.AccessTier), nil) + _, err := blockBlobURL.CommitBlockList(ctx, blocks, *httpHeaders, o.meta, azblob.BlobAccessConditions{}, azblob.AccessTierType(o.fs.opt.AccessTier), nil, azblob.ClientProvidedKeyOptions{}) return o.fs.shouldRetry(err) }) if err != nil { diff --git a/go.mod b/go.mod index d10b4afc8..7f404392d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( bazil.org/fuse v0.0.0-20200524192727-fb710f7dfd05 cloud.google.com/go v0.70.0 // indirect github.com/Azure/azure-pipeline-go v0.2.3 - github.com/Azure/azure-storage-blob-go v0.11.0 + github.com/Azure/azure-storage-blob-go v0.12.0 github.com/Azure/go-autorest/autorest/adal v0.9.8 github.com/Unknwon/goconfig v0.0.0-20200908083735-df7de6a44db8 github.com/a8m/tree v0.0.0-20201026183218-fce18e2a750e diff --git a/go.sum b/go.sum index f63e0ffb3..3ddb150e9 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-storage-blob-go v0.11.0 h1:WCTHKKNkHlzm7lzUNXRSD11784LwJqdrxnwWJxsJQHg= -github.com/Azure/azure-storage-blob-go v0.11.0/go.mod h1:A0u4VjtpgZJ7Y7um/+ix2DHBuEKFC6sEIlj0xc13a4Q= +github.com/Azure/azure-storage-blob-go v0.12.0 h1:7bFXA1QB+lOK2/ASWHhp6/vnxjaeeZq6t8w1Jyp0Iaw= +github.com/Azure/azure-storage-blob-go v0.12.0/go.mod h1:A0u4VjtpgZJ7Y7um/+ix2DHBuEKFC6sEIlj0xc13a4Q= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest/adal v0.9.2 h1:Aze/GQeAN1RRbGmnUJvUj+tFGBzFdIg3293/A9rbxC4=