Skip to content

Fix Azure Content-Type when appending #17830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
AliveDevil wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix Azure Content-Type when appending #17830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2199b15
Add failing test
AliveDevil Jan 14, 2026
f4ffe4a
Remove duplicate invocations.
dkocher Jan 24, 2026
fc609e5
Update dependency.
dkocher Jan 24, 2026
a29813c
No BlockBlobOutputStreamOptions parameter.
dkocher Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</parent>
<artifactId>azure</artifactId>
<properties>
<azure-storage-version>12.32.0</azure-storage-version>
<azure-storage-version>12.33.0</azure-storage-version>
</properties>

<dependencies>
Expand Down
7 changes: 3 additions & 4 deletions azure/src/main/java/ch/cyberduck/core/azure/AzureWriteFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,12 @@ public StatusOutputStream<Void> write(final Path file, final TransferStatus stat
// Existing block blob type
final PathAttributes attr = new AzureAttributesFinderFeature(session).find(file);
if(BlobType.APPEND_BLOB == BlobType.valueOf(attr.getCustom().get(AzureAttributesFinderFeature.KEY_BLOB_TYPE))) {
out = client.getAppendBlobClient().getBlobOutputStream(true);
final AppendBlobClient append = client.getAppendBlobClient();
// No BlockBlobOutputStreamOptions
out = append.getBlobOutputStream(true);
}
else {
final BlockBlobOutputStreamOptions options = new BlockBlobOutputStreamOptions()
.setMetadata(metadata)
.setHeaders(headers)
.setMetadata(metadata);
out = client.getBlockBlobClient().getBlobOutputStream(options);
Expand All @@ -158,7 +159,6 @@ public StatusOutputStream<Void> write(final Path file, final TransferStatus stat
case APPEND_BLOB: {
final AppendBlobClient append = client.getAppendBlobClient();
final AppendBlobCreateOptions options = new AppendBlobCreateOptions()
.setMetadata(metadata)
.setHeaders(headers)
.setMetadata(metadata);
append.createWithResponse(options, null, null);
Expand All @@ -168,7 +168,6 @@ public StatusOutputStream<Void> write(final Path file, final TransferStatus stat
default: {
final BlockBlobClient block = client.getBlockBlobClient();
final BlockBlobOutputStreamOptions options = new BlockBlobOutputStreamOptions()
.setMetadata(metadata)
.setHeaders(headers)
.setMetadata(metadata);
out = block.getBlobOutputStream(options);
Expand Down
4 changes: 4 additions & 0 deletions azure/src/test/java/ch/cyberduck/core/azure/AzureWriteFeatureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public void testWriteOverrideAppendBlob() throws Exception {
// Test double close
overwrite.close();
assertEquals("overwrite".getBytes(StandardCharsets.UTF_8).length, new AzureAttributesFinderFeature(session).find(test).getSize());
final Map<String, String> appendMetadata = new AzureMetadataFeature(session).getMetadata(test);
assertEquals("text/plain", appendMetadata.get("Content-Type"));
new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback());
}

Expand Down Expand Up @@ -100,6 +102,8 @@ public void testWriteOverrideBlockBlob() throws Exception {
// Test double close
overwrite.close();
assertEquals("overwrite".getBytes(StandardCharsets.UTF_8).length, new AzureAttributesFinderFeature(session).find(test).getSize());
final Map<String, String> overwriteMetadata = new AzureMetadataFeature(session).getMetadata(test);
assertEquals("text/plain", overwriteMetadata.get("Content-Type"));
new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback());
}
}