feat: support default checksums #1475
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package aws.sdk.kotlin.runtime.config.checksums | ||
|
|
||
| import aws.sdk.kotlin.runtime.ConfigurationException | ||
| import aws.sdk.kotlin.runtime.InternalSdkApi | ||
| import aws.sdk.kotlin.runtime.config.AwsSdkSetting | ||
| import aws.sdk.kotlin.runtime.config.profile.AwsProfile | ||
| import aws.sdk.kotlin.runtime.config.profile.requestChecksumCalculation | ||
| import aws.sdk.kotlin.runtime.config.profile.responseChecksumValidation | ||
| import aws.smithy.kotlin.runtime.client.config.HttpChecksumConfigOption | ||
| import aws.smithy.kotlin.runtime.config.resolve | ||
| import aws.smithy.kotlin.runtime.util.LazyAsyncValue | ||
| import aws.smithy.kotlin.runtime.util.PlatformProvider | ||
|
|
||
| /** | ||
| * Attempts to resolve requestChecksumCalculation from the specified sources. | ||
| * @return requestChecksumCalculation setting if found, the default value if not. | ||
| */ | ||
| @InternalSdkApi | ||
| public suspend fun resolveRequestChecksumCalculation(platform: PlatformProvider = PlatformProvider.System, profile: LazyAsyncValue<AwsProfile>): HttpChecksumConfigOption { | ||
| val unparsedString = AwsSdkSetting.AwsRequestChecksumCalculation.resolve(platform) ?: profile.get().requestChecksumCalculation | ||
| return parseHttpChecksumConfigOption(unparsedString, "requestChecksumCalculation") | ||
| } | ||
|
|
||
| /** | ||
| * Attempts to resolve responseChecksumValidation from the specified sources. | ||
| * @return responseChecksumValidation setting if found, the default value if not. | ||
| */ | ||
| @InternalSdkApi | ||
| public suspend fun resolveResponseChecksumValidation(platform: PlatformProvider = PlatformProvider.System, profile: LazyAsyncValue<AwsProfile>): HttpChecksumConfigOption { | ||
| val unparsedString = AwsSdkSetting.AwsResponseChecksumValidation.resolve(platform) ?: profile.get().responseChecksumValidation | ||
| return parseHttpChecksumConfigOption(unparsedString, "responseChecksumValidation") | ||
| } | ||
|
|
||
| private fun parseHttpChecksumConfigOption(unparsedString: String?, configOption: String): HttpChecksumConfigOption = | ||
| when (unparsedString?.uppercase()) { | ||
| null -> HttpChecksumConfigOption.WHEN_SUPPORTED | ||
| "WHEN_SUPPORTED" -> HttpChecksumConfigOption.WHEN_SUPPORTED | ||
| "WHEN_REQUIRED" -> HttpChecksumConfigOption.WHEN_REQUIRED | ||
| else -> throw ConfigurationException( | ||
| "'$unparsedString' is not a valid value for $configOption. Valid values are: ${HttpChecksumConfigOption.entries}", | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. correctness: This file should go in |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package aws.sdk.kotlin.runtime.http.interceptors | ||
|
|
||
| import aws.smithy.kotlin.runtime.client.config.HttpChecksumConfigOption | ||
| import aws.smithy.kotlin.runtime.http.interceptors.FlexibleChecksumsResponseInterceptor | ||
|
|
||
| /** | ||
| * S3 variant of the flexible checksum interceptor where composite checksums are not validated | ||
|
There was a problem hiding this comment. nit/docs: |
||
| */ | ||
| public class S3FlexibleChecksumResponseInterceptor( | ||
| responseValidationRequired: Boolean, | ||
| responseChecksumValidation: HttpChecksumConfigOption?, | ||
| ) : FlexibleChecksumsResponseInterceptor( | ||
| responseValidationRequired, | ||
| responseChecksumValidation, | ||
| ) { | ||
| override fun ignoreChecksum(checksum: String): Boolean = | ||
| checksum.isCompositeChecksum() | ||
| } | ||
|
|
||
| /** | ||
| * Verifies if a checksum is composite. | ||
| */ | ||
| private fun String.isCompositeChecksum(): Boolean { | ||
| // Ends with "-#" where "#" is a number | ||
| val regex = Regex("-(\\d)+$") | ||
| return regex.containsMatchIn(this) | ||
| } | ||
|
There was a problem hiding this comment. Does this need to exist? buildSrc is treated as an included build which means every subproject will have these config options applied. It seems odd to need this just for codegen tests There was a problem hiding this comment. It's the best way I could find to share a data class between subprojects, do you know of alternatives that would work better? I might've missed them There was a problem hiding this comment. You can make a new project that both of those subprojects depend on There was a problem hiding this comment. This is still a work in progress, I don't want to block the review because of this. I think worst case scenario we can come back and refactor this without it being a breaking change |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| plugins { | ||
| alias(libs.plugins.kotlin.jvm) | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| dependencyResolutionManagement { | ||
| versionCatalogs { | ||
| create("libs") { | ||
| from(files("../gradle/libs.versions.toml")) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package aws.sdk.kotlin.shared | ||
|
|
||
| /** | ||
| * An AWS SDK for Kotlin codegen test | ||
| */ | ||
| data class CodegenTest( | ||
| val name: String, | ||
| val model: Model, | ||
| val serviceShapeId: String, | ||
| val protocolName: String? = null, | ||
| ) | ||
|
|
||
| /** | ||
| * A smithy model file | ||
| */ | ||
| data class Model( | ||
| val fileName: String, | ||
| val path: String = "src/commonTest/resources/", | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment: Good catch!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What are these test reports used for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not 100% sure why but sometimes the logs from failed CI tests are not very useful. In those cases you can just get a test report from the build and see which test cases failed and exception messages. Other CI checks have this as well