Azure · ibrahimrabab · Mar 23, 2023 · Mar 16, 2023 · Mar 16, 2023 · Mar 16, 2023
@@ -418,9 +418,26 @@ public Mono<Response<BlockBlobItem>> uploadWithResponse(BlobParallelUploadOption
             // Can't use a Collections.emptyMap() because we add metadata for encryption.
             final Map<String, String> metadataFinal = options.getMetadata() == null
                 ? new HashMap<>() : options.getMetadata();
-            Flux<ByteBuffer> data = options.getDataFlux() == null ? Utility.convertStreamToByteBuffer(
-                options.getDataStream(), options.getLength(), BLOB_DEFAULT_UPLOAD_BLOCK_SIZE, false)
-                : options.getDataFlux();
+
+            final ParallelTransferOptions parallelTransferOptions =
+                ModelHelper.populateAndApplyDefaults(options.getParallelTransferOptions());
+
+            Flux<ByteBuffer> data = options.getDataFlux();
+            // no specified length: use azure.core's converter
+            if (data == null && options.getOptionalLength() == null) {
+                // We can only buffer up to max int due to restrictions in ByteBuffer.
+                int chunkSize = (int) Math.min(Constants.MAX_INPUT_STREAM_CONVERTER_BUFFER_LENGTH,
+                    parallelTransferOptions.getBlockSizeLong());
+                data = FluxUtil.toFluxByteBuffer(options.getDataStream(), chunkSize);
+                // specified length (legacy requirement): use custom converter. no marking because we buffer anyway.
+            } else if (data == null) {
+                // We can only buffer up to max int due to restrictions in ByteBuffer.
+                int chunkSize = (int) Math.min(Constants.MAX_INPUT_STREAM_CONVERTER_BUFFER_LENGTH,
+                    parallelTransferOptions.getBlockSizeLong());
+                data = Utility.convertStreamToByteBuffer(
+                    options.getDataStream(), options.getOptionalLength(), chunkSize, false);
+            }
+
             Flux<ByteBuffer> dataFinal = prepareToSendEncryptedRequest(data, metadataFinal);
             return super.uploadWithResponse(new BlobParallelUploadOptions(dataFinal)
                 .setParallelTransferOptions(options.getParallelTransferOptions()).setHeaders(options.getHeaders())

@@ -10,6 +10,7 @@ import com.azure.core.http.HttpResponse
 import com.azure.core.http.policy.HttpPipelinePolicy
 import com.azure.core.test.TestMode
 import com.azure.core.util.BinaryData
+import com.azure.core.util.Context
 import com.azure.core.util.ProgressListener
 import com.azure.identity.DefaultAzureCredentialBuilder
 import com.azure.storage.blob.BlobClientBuilder
@@ -1919,6 +1920,36 @@ class EncyptedBlockBlobAPITest extends APISpec {
         3 * Constants.MB | Constants.MB  || 4 // Encryption padding will add an extra block
     }
 
+    def "Encryption upload IS no length"() {
+        setup:
+        def randomData = getRandomByteArray(Constants.KB)
+        def input = new ByteArrayInputStream(randomData)
+
+        when:
+        ebc.upload(input)
+
+        then:
+        def stream = new ByteArrayOutputStream()
+        ebc.downloadStream(stream)
+        stream.toByteArray() == randomData
+    }
+
+    def "Encryption upload IS no length with options"() {
+        setup:
+        def randomData = getRandomByteArray(Constants.KB)
+        def payloadAsInputStream = new ByteArrayInputStream(randomData)
+        def os = new ByteArrayOutputStream()
+        def blobParallelUploadOptions = new BlobParallelUploadOptions(payloadAsInputStream)
+
+        when:
+        ebc.uploadWithResponse(blobParallelUploadOptions, null, Context.NONE)
+        ebc.downloadStream(os)
+
+        then:
+        notThrown(BlobStorageException)
+        os.toByteArray() == randomData
+    }
+
     def getPerCallVersionPolicy() {
         return new HttpPipelinePolicy() {
             @Override

@@ -0,0 +1,148 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/cd65fa1c0cd65fa1cb5993931dfdebdaf26e8401e8a8?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2022-11-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.22.0-beta.1 (11.0.16.1; Windows 11; 10.0)",
+      "x-ms-client-request-id" : "3f80d3ed-ca4e-4936-bffa-35bcb9990f38"
+    },
+    "Response" : {
+      "x-ms-version" : "2022-11-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "ETag" : "0x8DB25B5D8746BFC",
+      "Last-Modified" : "Thu, 16 Mar 2023 00:31:55 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "ee6775cd-901e-007b-099e-57985e000000",
+      "Date" : "Thu, 16 Mar 2023 00:31:54 GMT",
+      "x-ms-client-request-id" : "3f80d3ed-ca4e-4936-bffa-35bcb9990f38"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/cd65fa1c0cd65fa1cb5993931dfdebdaf26e8401e8a8/cd65fa1c3cd65fa1cb59398349c4ec107c999408db76",
+    "Headers" : {
+      "x-ms-version" : "2022-11-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.22.0-beta.1 azsdk-java-azure-storage-blob-cryptography/12.21.0-beta.1 (11.0.16.1; Windows 11; 10.0)",
+      "x-ms-client-request-id" : "d4f0acd6-9989-4182-9ea1-c1be13c35a8b"
+    },
+    "Response" : {
+      "x-ms-version" : "2022-11-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "BlobNotFound",
+      "retry-after" : "0",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "ee677a90-901e-007b-799e-57985e000000",
+      "Date" : "Thu, 16 Mar 2023 00:31:55 GMT",
+      "x-ms-client-request-id" : "d4f0acd6-9989-4182-9ea1-c1be13c35a8b"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/cd65fa1c0cd65fa1cb5993931dfdebdaf26e8401e8a8/cd65fa1c3cd65fa1cb59398349c4ec107c999408db76",
+    "Headers" : {
+      "x-ms-version" : "2022-11-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.22.0-beta.1 azsdk-java-azure-storage-blob-cryptography/12.21.0-beta.1 (11.0.16.1; Windows 11; 10.0)",
+      "x-ms-client-request-id" : "dd95ec2b-9f5f-43fb-ac07-f06d7e87b407",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "x-ms-version" : "2022-11-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "u1ZTN9uHVmM=",
+      "Last-Modified" : "Thu, 16 Mar 2023 00:31:56 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 16 Mar 2023 00:31:56 GMT",
+      "Content-MD5" : "9mjzZ51wWP5BcF4+S7Tsmg==",
+      "ETag" : "0x8DB25B5D95AB583",
+      "Content-Length" : "0",
+      "x-ms-request-id" : "fdf9bb00-d01e-006a-169e-5702ea000000",
+      "x-ms-client-request-id" : "dd95ec2b-9f5f-43fb-ac07-f06d7e87b407"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/cd65fa1c0cd65fa1cb5993931dfdebdaf26e8401e8a8/cd65fa1c3cd65fa1cb59398349c4ec107c999408db76",
+    "Headers" : {
+      "x-ms-version" : "2022-11-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.22.0-beta.1 azsdk-java-azure-storage-blob-cryptography/12.21.0-beta.1 (11.0.16.1; Windows 11; 10.0)",
+      "x-ms-client-request-id" : "7344d37a-de55-4f23-8e49-3466b748388b",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "x-ms-version" : "2022-11-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "CD9m/kXuIWY=",
+      "Last-Modified" : "Thu, 16 Mar 2023 00:31:57 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 16 Mar 2023 00:31:56 GMT",
+      "Content-MD5" : "PiphWIswaftJOxSvNgkciA==",
+      "ETag" : "0x8DB25B5D97492C8",
+      "Content-Length" : "0",
+      "x-ms-request-id" : "ee677cdb-901e-007b-189e-57985e000000",
+      "x-ms-client-request-id" : "7344d37a-de55-4f23-8e49-3466b748388b"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net/cd65fa1c0cd65fa1cb5993931dfdebdaf26e8401e8a8/cd65fa1c3cd65fa1cb59398349c4ec107c999408db76",
+    "Headers" : {
+      "x-ms-version" : "2022-11-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.22.0-beta.1 azsdk-java-azure-storage-blob-cryptography/12.21.0-beta.1 (11.0.16.1; Windows 11; 10.0)",
+      "x-ms-client-request-id" : "1ec02df6-05c3-4340-8610-cdf313ddda86"
+    },
+    "Response" : {
+      "x-ms-group" : "$superuser",
+      "x-ms-lease-status" : "unlocked",
+      "x-ms-version" : "2022-11-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 16 Mar 2023 00:31:57 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Thu, 16 Mar 2023 00:31:56 GMT",
+      "x-ms-resource-type" : "file",
+      "x-ms-blob-type" : "BlockBlob",
+      "Content-MD5" : "PiphWIswaftJOxSvNgkciA==",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-meta-encryptiondata" : "{\"EncryptionMode\":\"FullBlob\",\"WrappedContentKey\":{\"KeyId\":\"keyId\",\"EncryptedKey\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\",\"Algorithm\":\"RSA-OAEP-256\"},\"EncryptionAgent\":{\"Protocol\":\"1.0\",\"EncryptionAlgorithm\":\"AES_CBC_256\"},\"ContentEncryptionIV\":\"6NgmBAtUQp5JGUJO1cBFRQ==\",\"KeyWrappingMetadata\":{\"EncryptionLibrary\":\"JavaTrack212.22.0-beta.1\"}}",
+      "ETag" : "0x8DB25B5D97492C8",
+      "x-ms-creation-time" : "Thu, 16 Mar 2023 00:31:56 GMT",
+      "x-ms-permissions" : "rw-r-----",
+      "Content-Length" : "1040",
+      "x-ms-request-id" : "fdf9bb9a-d01e-006a-1d9e-5702ea000000",
+      "Body" : "bxWXBw9reJusCb5tnq9hN4ia/eQdCq077YcvChAGv9rV/3PhjqKiwHvrvt2A2gkiVuZdyyABbOw6EIqaBHE5pDPyrNQ42tU224L+QtoC28XoSkwdlkpt8AzIbBGV5QZIk68xw6mvPoNvkRUh5JRVue55ntYOAvicHJj/7s3IxjkyNtMm3AzxXadTqGexPA8Ho4sEZe98UZnmyhcCZroXeVstKG5o+sFr5n/HEPXJrDwfXVBVwG36K8Kv/qr2gHYuuiIhIdsllMMUkcGrpJGZs7aRR1d8PhYcambd7lOrfVPX8UrSL2eLl9Zrl3Vg16Hv/Jdod48G0VrPXLP6ZiK/E6K230uDEn5iw+uCxaaAhV3sPldJFabhJvuG2uNSWqHD66JIUbMWWjsXbyyBAXikrACAQ9uyua23SEx319FKSqMY78wG1CjxLQhabw537tOIRmxE/lx14s9Ty4Dgt1BaPX5TY40XyEEO2onOkrJ3V+0Y2T19j0A4q7VlAno4Eci2m+D3VUahi9jzOPDQYUw92UEXHzs6VEaxKiV6RBPSPP0TPvvuz36UvmbswDuE8wYizu60/Jz99WQQH+uKDkKPlORsxfCEWGUf2XJt5IeN0WNftHeFMBZr0rJn9+pFoa+a4JuWv3HrUwtY1He4o3ZQdOMe5lvnkNuBqPiE7QTY829BQjyrXa28ErC3jV7doyNQnNIpBf5AeDBPemipO+8t9T5Bjp4HiEhYc6WnCprxDeo7De4aZ/y80GTKhX0bI6pqwbIKzEs3XYzG2bXxDaQiFrV+EPMMxGz1fXGz+IPeuj0hDd4Lxyx2R8ya5gowToFzSYXJ6Shn96aPJjzkev65AKxBZ5MOhE2utkNu2i/IV1vj4vA2hs2PdAA86U39gYqfl+Vb3KAX7fCtSdM5IfA6fddLk7dmiL9EfV2z+6Ma8TBuiQqrs0BnUgzPBnf6NCI8G7y+dpPrMyXrxIIqlva778efiXwmwtyhJtPQJYfjYn0b0PpDHljrFy5121+ChSpPd+Iidol2XbTk3zgbb0r+goC7UDojyrlicEwP+8grr64LUl6tu6kK0s0yTvMEzcgXzkv5YwnjQFdIddJ8xBSV7hj/bjT365h0n4FCwfAnSBODuLwL/qPTyEClWHOIbdPfdYDiKqzxe4S94QdOz3ntwFuygxga2JyS6mppRrHWvu7XWTrqjTvNQx1l2tElI0EuiMe5nGxxYnHhoYg5D+OigHQ39eS60T77Hz0P12aV1hw1vdFO9eAsfXGtwE1zHl8/rNeob4zp8lz9gpiu82BisbmJLKXqv6gMb4VN3toaN3kzDcx2BdKO8CknHIbCiKaFmQW6yRK8O4bYVFYgutRHyr+s4tW0qU65BMIDv6hFk8k=",
+      "x-ms-owner" : "$superuser",
+      "x-ms-client-request-id" : "1ec02df6-05c3-4340-8610-cdf313ddda86",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://REDACTED.blob.core.windows.net/cd65fa1c0cd65fa1cb5993931dfdebdaf26e8401e8a8?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2022-11-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.22.0-beta.1 (11.0.16.1; Windows 11; 10.0)",
+      "x-ms-client-request-id" : "738d8d4f-9a62-495f-999f-454d2b874723"
+    },
+    "Response" : {
+      "x-ms-version" : "2022-11-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-id" : "ee677e20-901e-007b-469e-57985e000000",
+      "Date" : "Thu, 16 Mar 2023 00:31:56 GMT",
+      "x-ms-client-request-id" : "738d8d4f-9a62-495f-999f-454d2b874723"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "cd65fa1c0cd65fa1cb5993931dfdebdaf26e8401e8a8", "cd65fa1c1cd65fa1cb597644043b974f693ab4290918", "cd65fa1c2cd65fa1cb591337300a2587c69514f01bf4", "cd65fa1c3cd65fa1cb59398349c4ec107c999408db76", "db6cf848-1236-4b4c-b46f-ef3a8c046080" ]
+}