Skip to content
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

feat: expand use of chunked content encoding #1018

Closed
wants to merge 10 commits into from
Closed

feat: expand use of chunked content encoding #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
60dee0f
remove unused val
lauzadis Dec 26, 2023
42e0769
Copy flexible checksums SHA256 to signing config HashSpecification
lauzadis Dec 26, 2023
bd59c5d
update comment
lauzadis Dec 26, 2023
db302c1
changelog
lauzadis Dec 26, 2023
c591554
ktlint
lauzadis Dec 26, 2023
615f9c2
Don't require contentLength for aws-chunked streaming
lauzadis Dec 27, 2023
cf34645
Remove old optimization
lauzadis Dec 27, 2023
ab7750d
ktlint
lauzadis Dec 27, 2023
8251f58
copy logic to interceptor too
lauzadis Dec 27, 2023
ee75a60
update changelog
lauzadis Dec 27, 2023
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
5 changes: 5 additions & 0 deletions .changes/0b435166-944d-4836-8683-964034b823cc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "0b435166-944d-4836-8683-964034b823cc",
"type": "feature",
"description": "Enable `aws-chunked` content encoding for streaming requests without a content length"
}
4 changes: 2 additions & 2 deletions ...ng-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/internal/AwsChunkedUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ internal fun SdkBuffer.writeTrailerSignature(signature: String) {
*/
@InternalApi
public val HttpBody.isEligibleForAwsChunkedStreaming: Boolean
get() = (this is HttpBody.SourceContent || this is HttpBody.ChannelContent) && contentLength != null &&
(isOneShot || contentLength!! > AWS_CHUNKED_THRESHOLD)
get() = (this is HttpBody.SourceContent || this is HttpBody.ChannelContent) &&
(isOneShot || (contentLength?.compareTo(AWS_CHUNKED_THRESHOLD) ?: 0) > 0)
Comment on lines +46 to +47
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style: ?.compareTo works but is pretty verbose and still requires null-coalescing the value. Shorter would just be:

(contentLength ?: 0 > AWS_CHUNKED_THRESHOLD)

Same comment applies below.


/**
* @return a boolean representing if the signing configuration is configured (via [HashSpecification]) for aws-chunked content encoding
Expand Down
3 changes: 0 additions & 3 deletions ...aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ internal class DefaultCanonicalizer(private val sha256Supplier: HashSupplier = :
}
}

/** The number of bytes to read at a time during SHA256 calculation on streaming bodies. */
private const val STREAM_CHUNK_BYTES = 16384 // 16KB

/**
* Canonicalizes a path from this [Url.Builder].
* @param config The signing configuration to use
Expand Down
4 changes: 2 additions & 2 deletions ...on/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ public class FlexibleChecksumsRequestInterceptor<I>(

// FIXME this duplicates the logic from aws-signing-common, but can't import from there due to circular import.
private val HttpBody.isEligibleForAwsChunkedStreaming: Boolean
get() = (this is HttpBody.SourceContent || this is HttpBody.ChannelContent) && contentLength != null &&
(isOneShot || contentLength!! > 65536 * 16)
get() = (this is HttpBody.SourceContent || this is HttpBody.ChannelContent) &&
(isOneShot || (contentLength?.compareTo(65_536 * 16) ?: 0) > 0)

/**
* @return if the [HashFunction] is supported by flexible checksums
Expand Down
Loading