Break down resolve functions for compression settings

awslabs · Dec 12, 2023 · d301d6b · d301d6b
1 parent 4e209ff
commit d301d6b
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 37 deletions.
diff --git a/aws-runtime/aws-config/api/aws-config.api b/aws-runtime/aws-config/api/aws-config.api
@@ -227,7 +227,14 @@ public final class aws/sdk/kotlin/runtime/config/compression/CompressionSettings
 	public final fun getAwsRequestMinCompressionSizeBytes ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
 }
 
-public final class aws/sdk/kotlin/runtime/config/compression/ResolveRequestCompressionKt {
+public final class aws/sdk/kotlin/runtime/config/compression/ResolveDisableRequestCompressionKt {
+	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;
+}
+
+public final class aws/sdk/kotlin/runtime/config/compression/ResolveRequestMinCompressionSizeBytesKt {
+	public static final fun resolveRequestMinCompressionSizeBytes (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun resolveRequestMinCompressionSizeBytes$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/endpoints/AccountIdEndpointMode : java/lang/Enum {

diff --git a/...untime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactory.kt b/...untime/aws-config/common/src/aws/sdk/kotlin/runtime/config/AbstractAwsSdkClientFactory.kt
@@ -6,7 +6,8 @@
 package aws.sdk.kotlin.runtime.config
 
 import aws.sdk.kotlin.runtime.client.AwsSdkClientConfig
-import aws.sdk.kotlin.runtime.config.compression.resolveRequestCompression
+import aws.sdk.kotlin.runtime.config.compression.resolveDisableRequestCompression
+import aws.sdk.kotlin.runtime.config.compression.resolveRequestMinCompressionSizeBytes
 import aws.sdk.kotlin.runtime.config.endpoints.resolveUseDualStack
 import aws.sdk.kotlin.runtime.config.endpoints.resolveUseFips
 import aws.sdk.kotlin.runtime.config.profile.AwsProfile
@@ -80,7 +81,13 @@ public abstract class AbstractAwsSdkClientFactory<
             config.applicationId = config.applicationId ?: resolveUserAgentAppId(platform, profile)
 
             if (config is CompressionClientConfig.Builder) {
-                config.requestCompression = resolveRequestCompression(platform, profile)
+                config.requestCompression.disableRequestCompression =
+                    config.requestCompression.disableRequestCompression
+                        ?: resolveDisableRequestCompression(platform, profile)
+
+                config.requestCompression.requestMinCompressionSizeBytes =
+                    config.requestCompression.requestMinCompressionSizeBytes
+                        ?: resolveRequestMinCompressionSizeBytes(platform, profile)
             }
 
             finalizeConfig(builder, sharedConfig, profile)

diff --git a/.../common/src/aws/sdk/kotlin/runtime/config/compression/ResolveDisableRequestCompression.kt b/.../common/src/aws/sdk/kotlin/runtime/config/compression/ResolveDisableRequestCompression.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.sdk.kotlin.runtime.config.compression
+
+import aws.sdk.kotlin.runtime.config.profile.AwsProfile
+import aws.sdk.kotlin.runtime.config.profile.disableRequestCompression
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.config.resolve
+import aws.smithy.kotlin.runtime.util.LazyAsyncValue
+import aws.smithy.kotlin.runtime.util.PlatformProvider
+
+/**
+ * Attempts to resolve disableRequestCompression from the specified sources.
+ * @return disableRequestCompression setting if found, the default value if not.
+ */
+@InternalApi
+public suspend fun resolveDisableRequestCompression(
+    platform: PlatformProvider = PlatformProvider.System,
+    profile: LazyAsyncValue<AwsProfile>,
+): Boolean =
+    CompressionSettings.AwsDisableRequestCompression.resolve(platform)
+        ?: profile.get().disableRequestCompression
+        ?: false
diff --git a/...-config/common/src/aws/sdk/kotlin/runtime/config/compression/ResolveRequestCompression.kt b/...-config/common/src/aws/sdk/kotlin/runtime/config/compression/ResolveRequestCompression.kt
diff --git a/...on/src/aws/sdk/kotlin/runtime/config/compression/ResolveRequestMinCompressionSizeBytes.kt b/...on/src/aws/sdk/kotlin/runtime/config/compression/ResolveRequestMinCompressionSizeBytes.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.sdk.kotlin.runtime.config.compression
+
+import aws.sdk.kotlin.runtime.config.profile.AwsProfile
+import aws.sdk.kotlin.runtime.config.profile.requestMinCompressionSizeBytes
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.config.resolve
+import aws.smithy.kotlin.runtime.util.LazyAsyncValue
+import aws.smithy.kotlin.runtime.util.PlatformProvider
+
+/**
+ * Attempts to resolve requestMinCompressionSizeBytes from the specified sources.
+ * @return requestMinCompressionSizeBytes setting if found, the default value if not.
+ */
+@InternalApi
+public suspend fun resolveRequestMinCompressionSizeBytes(
+    platform: PlatformProvider = PlatformProvider.System,
+    profile: LazyAsyncValue<AwsProfile>,
+): Long =
+    CompressionSettings.AwsRequestMinCompressionSizeBytes.resolve(platform)
+        ?: profile.get().requestMinCompressionSizeBytes
+        ?: 10240