Review comments

 - Update variable naming
 - Throw if decoded content length not present
 - Throw if input request doesn't have content-length header

Author: dagnir

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java

@@ -118,7 +118,11 @@ private void signCommon(ChunkedEncodedPayload payload, V4RequestSigningResult re
 
         payload.decodedContentLength(request.firstMatchingHeader(X_AMZ_DECODED_CONTENT_LENGTH)
                                             .map(Long::parseLong)
-                                            .orElse(0L));
+                                            .orElseThrow(() -> {
+                                                String msg = String.format("Expected header '%s' to be present",
+                                                                           X_AMZ_DECODED_CONTENT_LENGTH);
+                                                return new RuntimeException(msg);
+                                            }));
 
         String checksum = request.firstMatchingHeader(X_AMZ_CONTENT_SHA256).orElseThrow(
             () -> new IllegalArgumentException(X_AMZ_CONTENT_SHA256 + " must be set!")

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChunkedEncodedPublisher.java

@@ -275,60 +275,60 @@ protected ChunkingSubscriber(Subscriber<? super Iterable<ByteBuffer>> subscriber
         }
 
         @Override
-        public void onNext(ByteBuffer inputBuffer) {
-            long totalBufferedBytes = (long) chunkBuffer.position() + inputBuffer.remaining();
+        public void onNext(ByteBuffer incomingData) {
+            long totalAvailableBytes = (long) chunkBuffer.position() + incomingData.remaining();
             // compute the number full chunks we have currently
-            int nBufferedChunks = (int) (totalBufferedBytes / chunkSize);
+            int numCompleteChunks = (int) (totalAvailableBytes / chunkSize);
 
-            List<ByteBuffer> chunks = new ArrayList<>(nBufferedChunks);
+            List<ByteBuffer> encodedChunks = new ArrayList<>(numCompleteChunks);
 
-            if (nBufferedChunks > 0) {
-                // We have some data from the previous inputBuffer
+            if (numCompleteChunks > 0) {
+                // We have some data from the previous incomingData
                 if (chunkBuffer.position() > 0) {
                     int bytesToFill = chunkBuffer.remaining();
 
-                    ByteBuffer slice = inputBuffer.slice();
+                    ByteBuffer dataToFillBuffer = incomingData.slice();
 
-                    slice.limit(slice.position() + bytesToFill);
-                    inputBuffer.position(inputBuffer.position() + bytesToFill);
+                    dataToFillBuffer.limit(dataToFillBuffer.position() + bytesToFill);
+                    incomingData.position(incomingData.position() + bytesToFill);
 
-                    // At this point, we know chunkBuffer is full since inputBuffer has at least enough bytes to make up a full
+                    // At this point, we know chunkBuffer is full since incomingData has at least enough bytes to make up a full
                     // chunk along with the data already in chunkBuffer
-                    chunkBuffer.put(slice);
+                    chunkBuffer.put(dataToFillBuffer);
                     chunkBuffer.flip();
-                    chunks.add(encodeChunk(chunkBuffer));
+                    encodedChunks.add(encodeChunk(chunkBuffer));
 
                     chunkBuffer.flip();
 
-                    nBufferedChunks--;
+                    numCompleteChunks--;
                 }
 
-                // Now encode all the remaining full chunks from inputBuffer.
-                // At this point chunkBuffer has no data in it; slice off chunks from inputBuffer and encode directly
-                for (int i = 0; i < nBufferedChunks; i++) {
-                    ByteBuffer slice = inputBuffer.slice();
+                // Now encode all the remaining full chunks from incomingData.
+                // At this point chunkBuffer has no data in it; slice off chunks from incomingData and encode directly
+                for (int i = 0; i < numCompleteChunks; i++) {
+                    ByteBuffer chunkData = incomingData.slice();
 
-                    int sliceLimit = Math.min(slice.limit(), chunkSize);
-                    slice.limit(sliceLimit);
+                    int maxChunkBytes = Math.min(chunkData.limit(), chunkSize);
+                    chunkData.limit(maxChunkBytes);
 
-                    inputBuffer.position(inputBuffer.position() + slice.remaining());
+                    incomingData.position(incomingData.position() + chunkData.remaining());
 
-                    if (slice.remaining() >= chunkSize) {
-                        slice.limit(slice.position() + chunkSize);
-                        chunks.add(encodeChunk(slice));
+                    if (chunkData.remaining() >= chunkSize) {
+                        chunkData.limit(chunkData.position() + chunkSize);
+                        encodedChunks.add(encodeChunk(chunkData));
                     } else {
-                        chunkBuffer.put(slice);
+                        chunkBuffer.put(chunkData);
                     }
                 }
 
-                if (inputBuffer.hasRemaining()) {
-                    chunkBuffer.put(inputBuffer);
+                if (incomingData.hasRemaining()) {
+                    chunkBuffer.put(incomingData);
                 }
             } else {
-                chunkBuffer.put(inputBuffer);
+                chunkBuffer.put(incomingData);
             }
 
-            subscriber.onNext(chunks);
+            subscriber.onNext(encodedChunks);
         }
     }
 

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/util/SignerUtils.java

@@ -248,9 +248,7 @@ public static CompletableFuture<Pair<SdkHttpRequest.Builder, Optional<Publisher<
             if (contentPublisher == null) {
                 contentLengthFuture = CompletableFuture.completedFuture(0L);
             } else {
-                LengthCalculatingSubscriber lengthCalculatingSubscriber = new LengthCalculatingSubscriber();
-                contentPublisher.subscribe(lengthCalculatingSubscriber);
-                contentLengthFuture = lengthCalculatingSubscriber.contentLengthFuture();
+                throw new UnsupportedOperationException("Content-Length header must be specified");
             }
         }
 

core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/TestUtils.java

@@ -68,6 +68,7 @@ public static <T extends AwsCredentialsIdentity> AsyncSignRequest<T> generateBas
                                                       .protocol("https")
                                                       .method(SdkHttpMethod.POST)
                                                       .putHeader("Host", "demo.us-east-1.amazonaws.com")
+                                                      .putHeader("content-length", Integer.toString(testPayload().length))
                                                       .putHeader("x-amz-archive-description", "test  test")
                                                       .encodedPath("/")
                                                       .uri(URI.create("https://demo.us-east-1.amazonaws.com"))