Blob upload input stream overwrite bug (#42582)

* fixing overwrite bug and adding tests * updating changelog * updating test recordings
Azure · Oct 25, 2024 · 862517e · 862517e
1 parent a279063
commit 862517e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/sdk/storage/azure-storage-blob-cryptography/assets.json b/sdk/storage/azure-storage-blob-cryptography/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/storage/azure-storage-blob-cryptography",
-  "Tag": "java/storage/azure-storage-blob-cryptography_9fd41be58a"
+  "Tag": "java/storage/azure-storage-blob-cryptography_da06ce0fc7"
 }
diff --git a/...test/java/com/azure/storage/blob/specialized/cryptography/EncryptedBlockBlobApiTests.java b/...test/java/com/azure/storage/blob/specialized/cryptography/EncryptedBlockBlobApiTests.java
@@ -1539,7 +1539,7 @@ public void downloadRequiresEncryption() {
 
     @Test
     public void encryptionUploadISOverwriteFails() {
-        assertThrows(BlobStorageException.class, () -> ebc.upload(DATA.getDefaultBinaryData()));
+        assertThrows(BlobStorageException.class, () -> ebc.upload(DATA.getDefaultInputStream()));
     }
 
     @Test
@@ -1602,7 +1602,7 @@ public void encryptionUploadISNoLength() {
         byte[] randomData = getRandomByteArray(Constants.KB);
         ByteArrayInputStream input = new ByteArrayInputStream(randomData);
 
-        ebc.upload(input);
+        ebc.upload(input, true);
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         ebc.downloadStream(stream);
 

diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed an issue where BlobClient.upload(InputStream data) would overwrite an existing blob by default.
 
 ### Other Changes
 

diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/storage/azure-storage-blob",
-  "Tag": "java/storage/azure-storage-blob_489177f72d"
+  "Tag": "java/storage/azure-storage-blob_4863e111dc"
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobClient.java
@@ -248,7 +248,7 @@ public PageBlobClient getPageBlobClient() {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void upload(InputStream data) {
-        uploadWithResponse(new BlobParallelUploadOptions(data), null, null);
+        upload(data, false);
     }
 
     /**

diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobApiTests.java
@@ -143,6 +143,11 @@ public void cleanup() {
         createdFiles.forEach(File::delete);
     }
 
+    @Test
+    public void uploadInputStreamMinOverwriteFails() {
+        assertThrows(BlobStorageException.class, () -> bc.upload(DATA.getDefaultInputStream()));
+    }
+
     @Test
     public void uploadInputStreamOverwriteFails() {
         assertThrows(BlobStorageException.class, () -> bc.upload(DATA.getDefaultInputStream(),
@@ -258,6 +263,7 @@ public void uploadReturnValueBinaryData() {
 
     @Test
     public void uploadInputStreamMin() {
+        bc = cc.getBlobClient(generateBlobName());
         assertDoesNotThrow(() -> bc.upload(DATA.getDefaultInputStream()));
         TestUtils.assertArraysEqual(bc.downloadContent().toBytes(), DATA.getDefaultBytes());
     }