feat!: Create retry modules (#710)

Author: jbelkins

.swiftlint.yml

@@ -2,13 +2,7 @@ excluded:
   - .build
   - Sources/SmithyTestUtil/*
   - Sources/WeatherSDK/*
-  - Tests/ClientRuntimeTests/*
-  - Tests/SmithyTestUtilTests/*
-  - Tests/SmithyXMLTests/*
-  - Tests/SmithyJSONTests/*
-  - Tests/SmithyFormURLTests/*
-  - Tests/SmithyTimestampsTests/*
-  - Tests/WeatherSDKTests/*
+  - Tests/*
   - smithy-swift-codegen-test/build/*
 
 analyzer_rules:

Package.swift

@@ -29,6 +29,8 @@ let package = Package(
     ],
     products: [
         .library(name: "ClientRuntime", targets: ["ClientRuntime"]),
+        .library(name: "SmithyRetriesAPI", targets: ["SmithyRetriesAPI"]),
+        .library(name: "SmithyRetries", targets: ["SmithyRetries"]),
         .library(name: "SmithyReadWrite", targets: ["SmithyReadWrite"]),
         .library(name: "SmithyXML", targets: ["SmithyXML"]),
         .library(name: "SmithyJSON", targets: ["SmithyJSON"]),
@@ -43,6 +45,8 @@ let package = Package(
         .target(
             name: "ClientRuntime",
             dependencies: [
+                "SmithyRetriesAPI",
+                "SmithyRetries",
                 "SmithyXML",
                 "SmithyJSON",
                 "SmithyFormURL",
@@ -53,6 +57,19 @@ let package = Package(
                 .copy("PrivacyInfo.xcprivacy")
             ]
         ),
+        .target(
+            name: "SmithyRetriesAPI"
+        ),
+        .target(
+            name: "SmithyRetries",
+            dependencies: [
+                .product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift"),
+            ]
+        ),
+        .testTarget(
+            name: "SmithyRetriesTests",
+            dependencies: ["ClientRuntime", "SmithyRetriesAPI", "SmithyRetries"]
+        ),
         .target(
             name: "SmithyReadWrite",
             dependencies: [
@@ -121,11 +138,11 @@ func addTestServiceTargets() {
     package.targets += [
         .target(
             name: "WeatherSDK",
-            dependencies: ["SmithyTestUtil", "ClientRuntime"]
+            dependencies: ["SmithyTestUtil", "ClientRuntime", "SmithyRetriesAPI", "SmithyRetries"]
         ),
         .testTarget(
             name: "WeatherSDKTests",
-            dependencies: ["WeatherSDK"]
+            dependencies: ["WeatherSDK", "SmithyTestUtil"]
         )
     ]
 }

Sources/ClientRuntime/Config/DefaultClientConfiguration.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import struct SmithyRetriesAPI.RetryStrategyOptions
+
 public protocol DefaultClientConfiguration: ClientConfiguration {
     /// The configuration for retry of failed network requests.
     ///

Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift

@@ -5,6 +5,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol SmithyRetriesAPI.RetryStrategy
+import protocol SmithyRetriesAPI.RetryErrorInfoProvider
+import struct SmithyRetriesAPI.RetryStrategyOptions
+import struct SmithyRetries.DefaultRetryStrategy
+import struct SmithyRetries.ExponentialBackoffStrategy
+
 /// Provides configuration options for a Smithy-based service.
 public struct DefaultSDKRuntimeConfiguration<DefaultSDKRuntimeRetryStrategy: RetryStrategy,
     DefaultSDKRuntimeRetryErrorInfoProvider: RetryErrorInfoProvider> {
@@ -107,7 +113,9 @@ public extension DefaultSDKRuntimeConfiguration {
     /// The retry strategy options to use when none is provided.
     ///
     /// Defaults to options with the defaults defined in `RetryStrategyOptions`.
-    static var defaultRetryStrategyOptions: RetryStrategyOptions { RetryStrategyOptions() }
+    static var defaultRetryStrategyOptions: RetryStrategyOptions {
+        RetryStrategyOptions(backoffStrategy: ExponentialBackoffStrategy())
+    }
 
     /// The log mode to use when none is provided
     ///

Sources/ClientRuntime/Middleware/RetryMiddleware.swift

@@ -10,6 +10,9 @@ import struct Foundation.Locale
 import struct Foundation.TimeInterval
 import struct Foundation.TimeZone
 import struct Foundation.UUID
+import protocol SmithyRetriesAPI.RetryStrategy
+import protocol SmithyRetriesAPI.RetryErrorInfoProvider
+import struct SmithyRetriesAPI.RetryStrategyOptions
 
 public struct RetryMiddleware<Strategy: RetryStrategy,
                               ErrorInfoProvider: RetryErrorInfoProvider,
@@ -64,17 +67,15 @@ public struct RetryMiddleware<Strategy: RetryStrategy,
                 context.getLogger()?.error("Failed to refresh retry token: \(errorInfo.errorType)")
                 throw operationError
             }
-            var estimatedSkew = context.attributes.get(key: AttributeKeys.estimatedSkew)
-            if estimatedSkew == nil {
-                estimatedSkew = 0
+            var estimatedSkew = context.attributes.get(key: AttributeKeys.estimatedSkew) ?? {
                 context.getLogger()?.info("Estimated skew not found; defaulting to zero.")
-            }
-            var socketTimeout = context.attributes.get(key: AttributeKeys.socketTimeout)
-            if socketTimeout == nil {
-                socketTimeout = 60.0
+                return 0
+            }()
+            var socketTimeout = context.attributes.get(key: AttributeKeys.socketTimeout) ?? {
                 context.getLogger()?.info("Socket timeout value not found; defaulting to 60 seconds.")
-            }
-            let ttlDateUTCString = getTTL(now: Date(), estimatedSkew: estimatedSkew!, socketTimeout: socketTimeout!)
+                return 60.0
+            }()
+            let ttlDateUTCString = getTTL(now: Date(), estimatedSkew: estimatedSkew, socketTimeout: socketTimeout)
             input.headers.update(
                 name: "amz-sdk-request",
                 value: "ttl=\(ttlDateUTCString); attempt=\(attemptNumber + 1); max=\(maxRetries)"

Sources/ClientRuntime/Orchestrator/Orchestrator.swift

@@ -5,6 +5,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol SmithyRetriesAPI.RetryStrategy
+import struct SmithyRetriesAPI.RetryErrorInfo
+
 /// Orchestrates operation execution
 ///
 /// Execution performs the following steps in order:

Sources/ClientRuntime/Orchestrator/OrchestratorBuilder.swift

@@ -5,6 +5,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import protocol SmithyRetriesAPI.RetryStrategy
+import struct SmithyRetriesAPI.RetryErrorInfo
+
 /// Builds an Orchestrator, combining runtime components, interceptors, serializers, and deserializers.
 ///
 /// Note: This is intended to be used within generated code, not directly.

Sources/ClientRuntime/Plugins/DefaultClientPlugin.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import struct SmithyRetries.DefaultRetryStrategy
+
 public class DefaultClientPlugin: Plugin {
     public init() {}
     public func configureClient(clientConfiguration: ClientConfiguration) {

Sources/ClientRuntime/Plugins/HttpClientPlugin.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import struct SmithyRetries.DefaultRetryStrategy
+
 public class DefaultHttpClientPlugin: Plugin {
 
     var httpClientConfiguration: HttpClientConfiguration

Sources/ClientRuntime/Plugins/RetryPlugin.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import struct SmithyRetriesAPI.RetryStrategyOptions
+
 public class RetryPlugin: Plugin {
 
     private var retryStrategyOptions: RetryStrategyOptions