From be7e744a2be370808022a55312b2da54295c1227 Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Fri, 10 Jan 2025 05:54:21 +1100 Subject: [PATCH] azure: Upload Content-Type option (#223) * azure: Upload Content-Type option * add changelog entry --------- Co-authored-by: John Judd --- CHANGELOG.md | 4 ++++ backend/azure/client.go | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 894fbaf..1b7e46b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.25.1] - 2025-01-09 +### Fixed +- The intersection of features #208 and #213 was missed (during rebase). + ## [6.25.0] - 2025-01-08 ### Added - Added NewFile option for Content-Type. diff --git a/backend/azure/client.go b/backend/azure/client.go index e76439d..a401e4f 100644 --- a/backend/azure/client.go +++ b/backend/azure/client.go @@ -11,6 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob" + "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" "github.com/c2fo/vfs/v6" @@ -110,7 +111,13 @@ func (a *DefaultClient) Upload(file vfs.File, content io.ReadSeeker, contentType if !ok { body = streaming.NopCloser(content) } - _, err = blobURL.Upload(context.Background(), body, nil) + var opts *blockblob.UploadOptions + if contentType != "" { + opts = &blockblob.UploadOptions{ + HTTPHeaders: &blob.HTTPHeaders{BlobContentType: &contentType}, + } + } + _, err = blobURL.Upload(context.Background(), body, opts) return err }