mirror of https://github.com/rclone/rclone.git
azureblob: send nil tier if empty string
This commit is contained in:
parent
d67ef19f6e
commit
a79db20bcd
|
@ -1471,9 +1471,8 @@ func (f *Fs) Copy(ctx context.Context, src fs.Object, remote string) (fs.Object,
|
||||||
srcBlobSVC := srcObj.getBlobSVC()
|
srcBlobSVC := srcObj.getBlobSVC()
|
||||||
srcURL := srcBlobSVC.URL()
|
srcURL := srcBlobSVC.URL()
|
||||||
|
|
||||||
tier := blob.AccessTier(f.opt.AccessTier)
|
|
||||||
options := blob.StartCopyFromURLOptions{
|
options := blob.StartCopyFromURLOptions{
|
||||||
Tier: &tier,
|
Tier: parseTier(f.opt.AccessTier),
|
||||||
}
|
}
|
||||||
var startCopy blob.StartCopyFromURLResponse
|
var startCopy blob.StartCopyFromURLResponse
|
||||||
err = f.pacer.Call(func() (bool, error) {
|
err = f.pacer.Call(func() (bool, error) {
|
||||||
|
@ -2045,10 +2044,9 @@ func (o *Object) uploadMultipart(ctx context.Context, in io.Reader, size int64,
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
tier := blob.AccessTier(o.fs.opt.AccessTier)
|
|
||||||
options := blockblob.CommitBlockListOptions{
|
options := blockblob.CommitBlockListOptions{
|
||||||
Metadata: o.getMetadata(),
|
Metadata: o.getMetadata(),
|
||||||
Tier: &tier,
|
Tier: parseTier(o.fs.opt.AccessTier),
|
||||||
HTTPHeaders: httpHeaders,
|
HTTPHeaders: httpHeaders,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2092,10 +2090,9 @@ func (o *Object) uploadSinglepart(ctx context.Context, in io.Reader, size int64,
|
||||||
b := bytes.NewReader(buf[:n])
|
b := bytes.NewReader(buf[:n])
|
||||||
rs := &readSeekCloser{Reader: b, Seeker: b}
|
rs := &readSeekCloser{Reader: b, Seeker: b}
|
||||||
|
|
||||||
tier := blob.AccessTier(o.fs.opt.AccessTier)
|
|
||||||
options := blockblob.UploadOptions{
|
options := blockblob.UploadOptions{
|
||||||
Metadata: o.getMetadata(),
|
Metadata: o.getMetadata(),
|
||||||
Tier: &tier,
|
Tier: parseTier(o.fs.opt.AccessTier),
|
||||||
HTTPHeaders: httpHeaders,
|
HTTPHeaders: httpHeaders,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2265,6 +2262,14 @@ func (o *Object) GetTier() string {
|
||||||
return string(o.accessTier)
|
return string(o.accessTier)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parseTier(tier string) *blob.AccessTier {
|
||||||
|
if tier == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
msTier := blob.AccessTier(tier)
|
||||||
|
return &msTier
|
||||||
|
}
|
||||||
|
|
||||||
// Check the interfaces are satisfied
|
// Check the interfaces are satisfied
|
||||||
var (
|
var (
|
||||||
_ fs.Fs = &Fs{}
|
_ fs.Fs = &Fs{}
|
||||||
|
|
Loading…
Reference in New Issue