fix!: Retry config (#1744)

* Add maxAttempts retry config back to AWS config; update doc comments.

* Add maxAttempts retry config property in AWS config to codegen side.

* Fix AWS config defaults provider so that top level config values from user for awsRetryMode and maxAttempts actually get used when resolving retryStrategyOptions.

* Update config plugin to actually use top level retry config values set by user when constructing retry strategy options.

* Update default provider calling site for retry strategy options in codegen.

* Update codegen test.

---------

Co-authored-by: Sichan Yoo <[email protected]>

Author: sichanyoo

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/AWSClientConfigDefaultsProvider.swift

@@ -99,17 +99,30 @@ public class AWSClientConfigDefaultsProvider {
         return resolvedRetryMode!
     }
 
-    public static func retryStrategyOptions() throws -> RetryStrategyOptions {
+    private static func maxAttempts(_ maxAttempts: Int? = nil) throws -> Int {
         let fileBasedConfig = try CRTFileBasedConfiguration.make()
-        let resolvedMaxAttempts = AWSRetryConfig.maxAttempts(
-            configValue: nil,
-            profileName: nil,
-            fileBasedConfig: fileBasedConfig
-        )
+        let resolvedMaxAttempts: Int?
+        if let maxAttempts {
+            resolvedMaxAttempts = maxAttempts
+        } else {
+            resolvedMaxAttempts = AWSRetryConfig.maxAttempts(
+                configValue: nil,
+                profileName: nil,
+                fileBasedConfig: fileBasedConfig
+            )
+        }
+        return resolvedMaxAttempts!
+    }
+
+    public static func retryStrategyOptions(
+        _ retryMode: AWSRetryMode? = nil,
+        _ maxAttempts: Int? = nil
+    ) throws -> RetryStrategyOptions {
+        let resolvedMaxAttempts = try self.maxAttempts(maxAttempts)
 
         let resolvedRateLimitingMode: RetryStrategyOptions.RateLimitingMode
 
-        switch try self.retryMode(nil) {
+        switch try self.retryMode(retryMode) {
         case .legacy, .standard:
             resolvedRateLimitingMode = .standard
         case .adaptive:

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Config/AWSDefaultClientConfiguration.swift

@@ -31,9 +31,19 @@ public protocol AWSDefaultClientConfiguration {
 
     /// The AWS retry mode to be used.
     ///
-    /// This value is set after resolving retry mode from the standard progression of potential sources.
+    /// May be one of `legacy`, `standard`, or `adaptive`.
+    /// For the Swift SDK, `legacy` is the same behavior as `standard`.
+    /// `standard` and `adaptive` retry strategies are as documented in `AWSClientRuntime.AWSRetryMode`.
     ///
-    /// May be one of `legacy`, `standard`, or `adaptive`.  `standard` and `adaptive` retry strategies are as defined in
-    /// Smithy Reference Architecture.  For the Swift SDK, `legacy` is the same behavior as `standard`.
+    /// This value is set after resolving retry mode from the standard progression of potential sources.
+    /// Default mode is `legacy`.
     var awsRetryMode: AWSRetryMode { get set }
+
+    /// The max number of times to attempt the request until success.
+    ///
+    /// This number includes the initial request, and the number of subsequent retries.
+    /// For example, value of 3 for this config variable would mean maximum of 2 retries.
+    ///
+    /// If set, this value gets used when resolving max attempts value from the standard progression of potential sources. If no value could be resolved, the SDK uses max attempts value of 3 by default.
+    var maxAttempts: Int? { get set }
 }

Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Plugins/DefaultAWSClientPlugin.swift

@@ -15,10 +15,13 @@ public class DefaultAWSClientPlugin: Plugin {
     }
 
     public func configureClient(clientConfiguration: ClientConfiguration) throws {
-        if var config = clientConfiguration as? DefaultClientConfiguration
+        if var config = clientConfiguration as? (DefaultClientConfiguration
             & AWSDefaultClientConfiguration
-            & AWSRegionClientConfiguration {
-            config.retryStrategyOptions = try AWSClientConfigDefaultsProvider.retryStrategyOptions()
+            & AWSRegionClientConfiguration) {
+            config.retryStrategyOptions = try AWSClientConfigDefaultsProvider.retryStrategyOptions(
+                config.awsRetryMode,
+                config.maxAttempts
+            )
             config.awsCredentialIdentityResolver = try AWSClientConfigDefaultsProvider.awsCredentialIdentityResolver()
         }
     }

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt

@@ -67,7 +67,7 @@ class AWSHttpProtocolServiceClient(
                     ConfigProperty(
                         "retryStrategyOptions",
                         SmithyRetriesAPITypes.RetryStrategyOptions,
-                        { it.format("AWSClientConfigDefaultsProvider.retryStrategyOptions()") },
+                        { it.format("AWSClientConfigDefaultsProvider.retryStrategyOptions(awsRetryMode, maxAttempts)") },
                         true
                     )
                 }
@@ -123,6 +123,9 @@ class AWSHttpProtocolServiceClient(
                         "awsCredentialIdentityResolver" -> {
                             "try AWSClientConfigDefaultsProvider.awsCredentialIdentityResolver()"
                         }
+                        "retryStrategyOptions" -> {
+                            "try AWSClientConfigDefaultsProvider.retryStrategyOptions()"
+                        }
                         else -> {
                             it.default?.render(writer) ?: "nil"
                         }

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/config/AWSDefaultClientConfiguration.kt

@@ -39,5 +39,6 @@ class AWSDefaultClientConfiguration : ClientConfiguration {
             { it.format("\$N.retryMode()", AWSClientRuntimeTypes.Core.AWSClientConfigDefaultsProvider) },
             true
         ),
+        ConfigProperty("maxAttempts", SwiftTypes.Int.toOptional())
     )
 }