"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
b2: fix "expected a FileSseMode but found: ''"
dougal4adb48fbbc92
diff --git a/backend/b2/api/types.go b/backend/b2/api/types.goindex ab4b221ec..784013ca6 100644--- a/backend/b2/api/types.go+++ b/backend/b2/api/types.go@@ -269,11 +269,11 @@ type GetFileInfoRequest struct {//// Example: { "src_last_modified_millis" : "1452802803026", "large_file_sha1" : "a3195dc1e7b46a2ff5da4b3c179175b75671e80d", "color": "blue" }type StartLargeFileRequest struct {- BucketID string `json:"bucketId"` // The ID of the bucket that the file will go in.- Name string `json:"fileName"` // The name of the file. See Files for requirements on file names.- ContentType string `json:"contentType"` // The MIME type of the content of the file, which will be returned in the Content-Type header when downloading the file. Use the Content-Type b2/x-auto to automatically set the stored Content-Type post upload. In the case where a file extension is absent or the lookup fails, the Content-Type is set to application/octet-stream.- Info map[string]string `json:"fileInfo"` // A JSON object holding the name/value pairs for the custom file info.- ServerSideEncryption ServerSideEncryption `json:"serverSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption+ BucketID string `json:"bucketId"` // The ID of the bucket that the file will go in.+ Name string `json:"fileName"` // The name of the file. See Files for requirements on file names.+ ContentType string `json:"contentType"` // The MIME type of the content of the file, which will be returned in the Content-Type header when downloading the file. Use the Content-Type b2/x-auto to automatically set the stored Content-Type post upload. In the case where a file extension is absent or the lookup fails, the Content-Type is set to application/octet-stream.+ Info map[string]string `json:"fileInfo"` // A JSON object holding the name/value pairs for the custom file info.+ ServerSideEncryption *ServerSideEncryption `json:"serverSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption}// StartLargeFileResponse is the response to StartLargeFileRequest@@ -334,25 +334,25 @@ type CancelLargeFileResponse struct {// CopyFileRequest is as passed to b2_copy_filetype CopyFileRequest struct {- SourceID string `json:"sourceFileId"` // The ID of the source file being copied.- Name string `json:"fileName"` // The name of the new file being created.- Range string `json:"range,omitempty"` // The range of bytes to copy. If not provided, the whole source file will be copied.- MetadataDirective string `json:"metadataDirective,omitempty"` // The strategy for how to populate metadata for the new file: COPY or REPLACE- ContentType string `json:"contentType,omitempty"` // The MIME type of the content of the file (REPLACE only)- Info map[string]string `json:"fileInfo,omitempty"` // This field stores the metadata that will be stored with the file. (REPLACE only)- DestBucketID string `json:"destinationBucketId,omitempty"` // The destination ID of the bucket if set, if not the source bucket will be used- SourceServerSideEncryption ServerSideEncryption `json:"sourceServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the source file- DestinationServerSideEncryption ServerSideEncryption `json:"destinationServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the destination file+ SourceID string `json:"sourceFileId"` // The ID of the source file being copied.+ Name string `json:"fileName"` // The name of the new file being created.+ Range string `json:"range,omitempty"` // The range of bytes to copy. If not provided, the whole source file will be copied.+ MetadataDirective string `json:"metadataDirective,omitempty"` // The strategy for how to populate metadata for the new file: COPY or REPLACE+ ContentType string `json:"contentType,omitempty"` // The MIME type of the content of the file (REPLACE only)+ Info map[string]string `json:"fileInfo,omitempty"` // This field stores the metadata that will be stored with the file. (REPLACE only)+ DestBucketID string `json:"destinationBucketId,omitempty"` // The destination ID of the bucket if set, if not the source bucket will be used+ SourceServerSideEncryption *ServerSideEncryption `json:"sourceServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the source file+ DestinationServerSideEncryption *ServerSideEncryption `json:"destinationServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the destination file}// CopyPartRequest is the request for b2_copy_part - the response is UploadPartResponsetype CopyPartRequest struct {- SourceID string `json:"sourceFileId"` // The ID of the source file being copied.- LargeFileID string `json:"largeFileId"` // The ID of the large file the part will belong to, as returned by b2_start_large_file.- PartNumber int64 `json:"partNumber"` // Which part this is (starting from 1)- Range string `json:"range,omitempty"` // The range of bytes to copy. If not provided, the whole source file will be copied.- SourceServerSideEncryption ServerSideEncryption `json:"sourceServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the source file- DestinationServerSideEncryption ServerSideEncryption `json:"destinationServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the destination file+ SourceID string `json:"sourceFileId"` // The ID of the source file being copied.+ LargeFileID string `json:"largeFileId"` // The ID of the large file the part will belong to, as returned by b2_start_large_file.+ PartNumber int64 `json:"partNumber"` // Which part this is (starting from 1)+ Range string `json:"range,omitempty"` // The range of bytes to copy. If not provided, the whole source file will be copied.+ SourceServerSideEncryption *ServerSideEncryption `json:"sourceServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the source file+ DestinationServerSideEncryption *ServerSideEncryption `json:"destinationServerSideEncryption,omitempty"` // A JSON object holding values related to Server-Side Encryption for the destination file}// UpdateBucketRequest describes a request to modify a B2 bucketdiff --git a/backend/b2/b2.go b/backend/b2/b2.goindex 4bf4a2a5a..7d1df41f3 100644--- a/backend/b2/b2.go+++ b/backend/b2/b2.go@@ -1514,8 +1514,8 @@ func (f *Fs) copy(ctx context.Context, dstObj *Object, srcObj *Object, newInfo *CustomerKey: f.opt.SSECustomerKeyBase64,CustomerKeyMd5: f.opt.SSECustomerKeyMD5,}- request.SourceServerSideEncryption = serverSideEncryptionConfig- request.DestinationServerSideEncryption = serverSideEncryptionConfig+ request.SourceServerSideEncryption = &serverSideEncryptionConfig+ request.DestinationServerSideEncryption = &serverSideEncryptionConfig}if newInfo == nil {request.MetadataDirective = "COPY"diff --git a/backend/b2/upload.go b/backend/b2/upload.goindex bc35ad3c5..3034ca174 100644--- a/backend/b2/upload.go+++ b/backend/b2/upload.go@@ -145,7 +145,7 @@ func (f *Fs) newLargeUpload(ctx context.Context, o *Object, in io.Reader, src fsrequest.Info = newInfo.Info}if o.fs.opt.SSECustomerKey != "" && o.fs.opt.SSECustomerKeyMD5 != "" {- request.ServerSideEncryption = api.ServerSideEncryption{+ request.ServerSideEncryption = &api.ServerSideEncryption{Mode: "SSE-C",Algorithm: o.fs.opt.SSECustomerAlgorithm,CustomerKey: o.fs.opt.SSECustomerKeyBase64,@@ -356,8 +356,8 @@ func (up *largeUpload) copyChunk(ctx context.Context, part int, partSize int64)CustomerKey: up.o.fs.opt.SSECustomerKeyBase64,CustomerKeyMd5: up.o.fs.opt.SSECustomerKeyMD5,}- request.SourceServerSideEncryption = serverSideEncryptionConfig- request.DestinationServerSideEncryption = serverSideEncryptionConfig+ request.SourceServerSideEncryption = &serverSideEncryptionConfig+ request.DestinationServerSideEncryption = &serverSideEncryptionConfig}var response api.UploadPartResponseresp, err := up.f.srv.CallJSON(ctx, &opts, &request, &response)