Added responseChecksumValidation

0marperez · 0marperez · commit 5133a60c45d1 · 2024-11-11T02:51:04.000-05:00
diff --git a/aws-runtime/aws-config/api/aws-config.api b/aws-runtime/aws-config/api/aws-config.api
@@ -245,6 +245,7 @@ public final class aws/sdk/kotlin/runtime/config/AwsSdkSetting {
 	public final fun getAwsRegion ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
 	public final fun getAwsRequestChecksumCalculation ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
 	public final fun getAwsRequestMinCompressionSizeBytes ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
+	public final fun getAwsResponseChecksumValidation ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
 	public final fun getAwsRetryMode ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
 	public final fun getAwsRoleArn ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
 	public final fun getAwsRoleSessionName ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
@@ -266,6 +267,11 @@ public final class aws/sdk/kotlin/runtime/config/checksums/ResolveRequestChecksu
 	public static synthetic fun resolveRequestChecksumCalculation$default (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class aws/sdk/kotlin/runtime/config/checksums/ResolveResponseChecksumValidationKt {
+	public static final fun resolveResponseChecksumValidation (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun resolveResponseChecksumValidation$default (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
 public final class aws/sdk/kotlin/runtime/config/compression/RequestCompressionResolversKt {
 	public static final fun resolveDisableRequestCompression (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun resolveDisableRequestCompression$default (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
@@ -475,6 +481,7 @@ public final class aws/sdk/kotlin/runtime/config/profile/AwsProfileKt {
 	public static final fun getRegion (Laws/sdk/kotlin/runtime/config/profile/ConfigSection;)Ljava/lang/String;
 	public static final fun getRequestChecksumCalculation (Laws/sdk/kotlin/runtime/config/profile/ConfigSection;)Ljava/lang/String;
 	public static final fun getRequestMinCompressionSizeBytes (Laws/sdk/kotlin/runtime/config/profile/ConfigSection;)Ljava/lang/Long;
+	public static final fun getResponseChecksumValidation (Laws/sdk/kotlin/runtime/config/profile/ConfigSection;)Ljava/lang/String;
 	public static final fun getRetryMode (Laws/sdk/kotlin/runtime/config/profile/ConfigSection;)Laws/smithy/kotlin/runtime/client/config/RetryMode;
 	public static final fun getRoleArn (Laws/sdk/kotlin/runtime/config/profile/ConfigSection;)Ljava/lang/String;
 	public static final fun getSdkUserAgentAppId (Laws/sdk/kotlin/runtime/config/profile/ConfigSection;)Ljava/lang/String;
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactory.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactory.kt
@@ -7,6 +7,7 @@ package aws.sdk.kotlin.runtime.config
 
 import aws.sdk.kotlin.runtime.client.AwsSdkClientConfig
 import aws.sdk.kotlin.runtime.config.checksums.resolveRequestChecksumCalculation
+import aws.sdk.kotlin.runtime.config.checksums.resolveResponseChecksumValidation
 import aws.sdk.kotlin.runtime.config.compression.resolveDisableRequestCompression
 import aws.sdk.kotlin.runtime.config.compression.resolveRequestMinCompressionSizeBytes
 import aws.sdk.kotlin.runtime.config.endpoints.resolveUseDualStack
@@ -99,6 +100,9 @@ public abstract class AbstractAwsSdkClientFactory<
             if (config is HttpChecksumClientConfig.Builder) {
                 config.requestChecksumCalculation =
                     config.requestChecksumCalculation ?: resolveRequestChecksumCalculation(platform, profile)
+
+                config.responseChecksumValidation =
+                    config.responseChecksumValidation ?: resolveResponseChecksumValidation(platform, profile)
             }
 
             finalizeConfig(builder)
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AwsSdkSetting.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AwsSdkSetting.kt
@@ -214,6 +214,12 @@ public object AwsSdkSetting {
      */
     public val AwsRequestChecksumCalculation: EnvironmentSetting<String> =
         strEnvSetting("aws.requestChecksumCalculation", "AWS_REQUEST_CHECKSUM_CALCULATION")
+
+    /**
+     * todo
+     */
+    public val AwsResponseChecksumValidation: EnvironmentSetting<String> =
+        strEnvSetting("aws.responseChecksumValidation", "AWS_RESPONSE_CHECKSUM_VALIDATION")
 }
 
 /**
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveRequestChecksumCalculation.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveRequestChecksumCalculation.kt
@@ -5,7 +5,7 @@ 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.smithy.kotlin.runtime.client.config.RequestChecksumCalculation
+import aws.smithy.kotlin.runtime.client.config.ChecksumConfigOption
 import aws.smithy.kotlin.runtime.config.resolve
 import aws.smithy.kotlin.runtime.util.LazyAsyncValue
 import aws.smithy.kotlin.runtime.util.PlatformProvider
@@ -15,14 +15,15 @@ import java.util.*
  * todo
  */
 @InternalSdkApi
-public suspend fun resolveRequestChecksumCalculation(platform: PlatformProvider = PlatformProvider.System, profile: LazyAsyncValue<AwsProfile>): RequestChecksumCalculation? {
+public suspend fun resolveRequestChecksumCalculation(platform: PlatformProvider = PlatformProvider.System, profile: LazyAsyncValue<AwsProfile>): ChecksumConfigOption? {
     AwsSdkSetting.AwsRequestChecksumCalculation.resolve(platform) ?: profile.get().requestChecksumCalculation?.let {
         try {
-            return RequestChecksumCalculation.valueOf(it.uppercase(Locale.getDefault()))
+            return ChecksumConfigOption.valueOf(it.uppercase(Locale.getDefault()))
         } catch (_: IllegalArgumentException) {
-            throw ConfigurationException("'$it' is not a valid value for request checksum calculation. Valid values are: 'WHEN_SUPPORTED' & 'WHEN_REQUIRED'")
+            throw ConfigurationException(
+                "'$it' is not a valid value for request checksum calculation. Valid values are: ${ChecksumConfigOption.entries.toTypedArray()}",
+            )
         }
     }
     return null
 }
-
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveResponseChecksumValidation.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveResponseChecksumValidation.kt
@@ -0,0 +1,29 @@
+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.responseChecksumValidation
+import aws.smithy.kotlin.runtime.client.config.ChecksumConfigOption
+import aws.smithy.kotlin.runtime.config.resolve
+import aws.smithy.kotlin.runtime.util.LazyAsyncValue
+import aws.smithy.kotlin.runtime.util.PlatformProvider
+import java.util.*
+
+/**
+ * todo
+ */
+@InternalSdkApi
+public suspend fun resolveResponseChecksumValidation(platform: PlatformProvider = PlatformProvider.System, profile: LazyAsyncValue<AwsProfile>): ChecksumConfigOption? {
+    AwsSdkSetting.AwsResponseChecksumValidation.resolve(platform) ?: profile.get().responseChecksumValidation?.let {
+        try {
+            return ChecksumConfigOption.valueOf(it.uppercase(Locale.getDefault()))
+        } catch (_: IllegalArgumentException) {
+            throw ConfigurationException(
+                "'$it' is not a valid value for response checksum validation. Valid values are: ${ChecksumConfigOption.entries.toTypedArray()}",
+            )
+        }
+    }
+    return null
+}
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/profile/AwsProfile.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/profile/AwsProfile.kt
@@ -174,6 +174,13 @@ public val AwsProfile.sigV4aSigningRegionSet: String?
 public val AwsProfile.requestChecksumCalculation: String?
     get() = getOrNull("request_checksum_calculation")
 
+/**
+ * todo
+ */
+@InternalSdkApi
+public val AwsProfile.responseChecksumValidation: String?
+    get() = getOrNull("response_checksum_validation")
+
 /**
  * Parse a config value as a boolean, ignoring case.
  */
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -4,4 +4,4 @@ plugins {
 
 repositories {
     mavenCentral()
-}
+}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -4,4 +4,4 @@ dependencyResolutionManagement {
             from(files("../gradle/libs.versions.toml"))
         }
     }
-}
+}
diff --git a/buildSrc/src/main/kotlin/shared/CodegenTest.kt b/buildSrc/src/main/kotlin/shared/CodegenTest.kt
@@ -16,4 +16,4 @@ data class CodegenTest(
 data class Model(
     val fileName: String,
     val path: String = "src/commonTest/resources/",
-)
+)
diff --git a/tests/codegen/checksums/src/commonTest/kotlin/ChecksumResponseTests.kt b/tests/codegen/checksums/src/commonTest/kotlin/ChecksumResponseTests.kt
@@ -6,4 +6,4 @@ class ChecksumResponseTests {
     fun test() {
         TestClient {}.use { client -> client.close() }
     }
-}
+}
diff --git a/tests/codegen/checksums/src/commonTest/kotlin/ClientConfigTests.kt b/tests/codegen/checksums/src/commonTest/kotlin/ClientConfigTests.kt
@@ -2,16 +2,16 @@ import aws.sdk.kotlin.runtime.auth.credentials.StaticCredentialsProvider
 import aws.sdk.kotlin.test.clientconfig.*
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
-import aws.smithy.kotlin.runtime.client.config.RequestChecksumCalculation
+import aws.smithy.kotlin.runtime.client.config.ChecksumConfigOption
 import aws.smithy.kotlin.runtime.http.interceptors.HttpInterceptor
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.httptest.TestEngine
 import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.Nested
+import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
-import aws.smithy.kotlin.runtime.httptest.TestEngine
-import org.junit.jupiter.api.Nested
-import kotlin.test.Ignore
 
 class ClientConfigTests {
     @Nested
@@ -22,7 +22,7 @@ class ClientConfigTests {
             val testInterceptor = TestInterceptor()
 
             ClientConfigTestClient {
-                requestChecksumCalculation = RequestChecksumCalculation.WHEN_SUPPORTED
+                requestChecksumCalculation = ChecksumConfigOption.WHEN_SUPPORTED
                 interceptors = mutableListOf(testInterceptor)
                 httpClient = TestEngine()
                 credentialsProvider = StaticCredentialsProvider(
@@ -43,7 +43,7 @@ class ClientConfigTests {
             val testInterceptor = TestInterceptor()
 
             ClientConfigTestClient {
-                requestChecksumCalculation = RequestChecksumCalculation.WHEN_REQUIRED
+                requestChecksumCalculation = ChecksumConfigOption.WHEN_REQUIRED
                 interceptors = mutableListOf(testInterceptor)
                 httpClient = TestEngine()
                 credentialsProvider = StaticCredentialsProvider(
@@ -68,7 +68,7 @@ class ClientConfigTests {
             val testInterceptor = TestInterceptor()
 
             ClientConfigTestClient {
-                requestChecksumCalculation = RequestChecksumCalculation.WHEN_SUPPORTED
+                requestChecksumCalculation = ChecksumConfigOption.WHEN_SUPPORTED
                 interceptors = mutableListOf(testInterceptor)
                 httpClient = TestEngine()
                 credentialsProvider = StaticCredentialsProvider(
@@ -90,7 +90,7 @@ class ClientConfigTests {
             val testInterceptor = TestInterceptor()
 
             ClientConfigTestClient {
-                requestChecksumCalculation = RequestChecksumCalculation.WHEN_REQUIRED
+                requestChecksumCalculation = ChecksumConfigOption.WHEN_REQUIRED
                 interceptors = mutableListOf(testInterceptor)
                 httpClient = TestEngine()
                 credentialsProvider = StaticCredentialsProvider(
diff --git a/tests/codegen/checksums/src/commonTest/kotlin/RequestChecksumTests.kt b/tests/codegen/checksums/src/commonTest/kotlin/RequestChecksumTests.kt
@@ -6,4 +6,4 @@ class RequestChecksumTests {
     fun test() {
         TestClient {}.use { client -> client.close() }
     }
-}
+}
diff --git a/tests/codegen/checksums/src/commonTest/kotlin/StreamingRequestChecksumTests.kt b/tests/codegen/checksums/src/commonTest/kotlin/StreamingRequestChecksumTests.kt
@@ -6,4 +6,4 @@ class StreamingRequestChecksumTests {
     fun test() {
         TestClient {}.use { client -> client.close() }
     }
-}
+}
diff --git a/tests/codegen/event-stream/build.gradle.kts b/tests/codegen/event-stream/build.gradle.kts
@@ -15,13 +15,13 @@ val tests = listOf(
         "restJson1",
         Model("event-stream-model-template.smithy"),
         "aws.sdk.kotlin.test#TestService",
-        "restJson1"
+        "restJson1",
     ),
     CodegenTest(
         "awsJson11",
         Model("event-stream-initial-request-response.smithy"),
         "aws.sdk.kotlin.test#TestService",
-        "awsJson1_1"
+        "awsJson1_1",
     ),
 )
 

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ dependencyResolutionManagement {`
`4`	`4`	`from(files("../gradle/libs.versions.toml"))`
`5`	`5`	`}`
`6`	`6`	`}`
`7`		`-}`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ class ChecksumResponseTests {`
`6`	`6`	`fun test() {`
`7`	`7`	`TestClient {}.use { client -> client.close() }`
`8`	`8`	`}`
`9`		`-}`
	`9`	`+}`