chore: Update to smithy 1.9 (#269)

Co-authored-by: John Woo <[email protected]>

Author: kneekey23

Packages/ClientRuntime/Sources/Networking/Http/CRT/CRTClientEngine.swift

@@ -12,7 +12,6 @@ import AwsCommonRuntimeKit
 
 public class CRTClientEngine: HttpClientEngine {
 
-    
     private var logger: LogAgent
     private var crtLogger: Logger
     private var connectionPools: [Endpoint: HttpClientConnectionManager] = [:]

Packages/ClientRuntime/Sources/Networking/Http/DefaultMiddlewares/LoggerMiddleware.swift

@@ -31,7 +31,7 @@ public struct LoggerMiddleware<Output: HttpResponseBinding,
 
         if clientLogMode == .request || clientLogMode == .requestAndResponse {
             logger.debug("Request: \(input.debugDescription)")
-        }else if clientLogMode == .requestAndResponseWithBody || clientLogMode == .requestWithBody {
+        } else if clientLogMode == .requestAndResponseWithBody || clientLogMode == .requestWithBody {
             logger.debug("Request: \(input.debugDescriptionWithBody)")
         }
 

Packages/ClientRuntime/Sources/Networking/Http/HttpStatusCode.swift

@@ -147,7 +147,6 @@ extension HttpStatusCode: CustomStringConvertible {
     }
 }
 
-
 extension HttpStatusCode {
     public var isRetryable: Bool {
         if (502..<505).contains(rawValue) || rawValue == 500 {

Packages/ClientRuntime/Sources/Retries/ExponentialBackOffJitterMode.swift

@@ -23,4 +23,3 @@ extension ExponentialBackOffJitterMode {
         }
     }
 }
-

Packages/ClientRuntime/Sources/Retries/RetryOptions.swift

@@ -18,7 +18,6 @@ public struct RetryOptions {
     }
 }
 
-
 extension RetryOptions {
     func toCRTType() -> TransformRetryOptions {
         return TransformRetryOptions(initialBucketCapacity: initialBucketCapacity,

Packages/ClientRuntime/Sources/Retries/SDKRetrier.swift

@@ -96,4 +96,3 @@ public class SDKRetrier: Retrier {
         }
     }
 }
-

Packages/ClientRuntime/Sources/Util/PlatformOperatingSystem.swift

@@ -15,7 +15,6 @@ public enum PlatformOperatingSystem: String {
     case unknown
 }
 
-
 public var currentOS: PlatformOperatingSystem {
     #if os(Linux)
     return .linux
@@ -33,4 +32,3 @@ public var currentOS: PlatformOperatingSystem {
      #error("Cannot use a an operating system we do not support")
     #endif
 }
-

Packages/ClientRuntime/Sources/Util/SwiftVersion.swift

@@ -24,4 +24,3 @@ public var swiftVersion: String {
       #error("Cannot use a version of Swift less than 5.0")
     #endif
 }
-

Packages/SmithyTestUtil/Sources/RequestTestUtil/HttpRequestTestBase+FormURL.swift

@@ -10,8 +10,8 @@ import ClientRuntime
 extension HttpRequestTestBase {
     public func assertEqualFormURLBody(_ expected: Data, _ actual: Data) {
         let expectedQueryItems = convertToQueryItems(data: expected)
-        let acutalQueryItems = convertToQueryItems(data: actual)
-        assertEqualQueryItems(expectedQueryItems, acutalQueryItems)
+        let actualQueryItems = convertToQueryItems(data: actual)
+        assertEqualQueryItems(expectedQueryItems, actualQueryItems)
     }
 
     private func convertToQueryItems(data: Data) -> [URLQueryItem] {
@@ -20,21 +20,18 @@ extension HttpRequestTestBase {
             return []
         }
         var queryItems: [URLQueryItem] = []
-        let keyValuePairs = queryString.components(separatedBy: "\n")
+        let sanitizedQueryString = queryString.replacingOccurrences(of: "\n", with: "")
+        let keyValuePairs = sanitizedQueryString.components(separatedBy: "&")
         for keyValue in keyValuePairs {
             let keyValueArray = keyValue.components(separatedBy: "=")
             guard keyValueArray.count >= 1 else {
                 XCTFail("Failed to decode query string. Problem with the encoding? Query string is:\n\(queryString)")
                 return []
             }
-            let name: String = sanitizeQueryStringName(keyValueArray[0])
-            let value = keyValueArray.count >= 2 ? keyValueArray[1] : nil
+            let name: String = keyValueArray[0]
+            let value = keyValueArray.count >= 2 ? sanitizeStringForNonConformingValues(keyValueArray[1]) : nil
             queryItems.append(URLQueryItem(name: name, value: value))
         }
         return queryItems
     }
-
-    private func sanitizeQueryStringName(_ name: String) -> String {
-        return name.hasPrefix("&") ? String(name.dropFirst()) : name
-    }
 }

Packages/SmithyTestUtil/Sources/RequestTestUtil/HttpRequestTestBase.swift

@@ -28,15 +28,18 @@ open class HttpRequestTestBase: XCTestCase {
         for queryParam in queryParams {
             let queryParamComponents = queryParam.components(separatedBy: "=")
             if queryParamComponents.count > 1 {
+                let value = sanitizeStringForNonConformingValues(queryParamComponents[1])
+
                 builder.withQueryItem(URLQueryItem(name: queryParamComponents[0],
-                                                   value: queryParamComponents[1]))
+                                                   value: value))
             } else {
                 builder.withQueryItem(URLQueryItem(name: queryParamComponents[0], value: nil))
             }
         }
 
         for (headerName, headerValue) in headers {
-            builder.withHeader(name: headerName, value: headerValue)
+            let value = sanitizeStringForNonConformingValues(headerValue)
+            builder.withHeader(name: headerName, value: value)
         }
 
         guard let body = body else {
@@ -53,6 +56,16 @@ open class HttpRequestTestBase: XCTestCase {
 
     }
 
+    func sanitizeStringForNonConformingValues(_ input: String) -> String {
+        switch input {
+        case "Infinity": return "inf"
+        case "-Infinity": return "-inf"
+        case "NaN": return "nan"
+        default:
+            return input
+        }
+    }
+    
     /**
      Check if a Query Item with given name exists in array of `URLQueryItem`
      */
@@ -187,7 +200,7 @@ open class HttpRequestTestBase: XCTestCase {
 
         XCTAssert(expectedQueryItems.count == actualQueryItems.count, "Number of query params does not match")
         for (keyValue, expectedCount) in expectedKVCount {
-            XCTAssert(actualKVCount[keyValue] == expectedCount, "Expected \(keyValue) to appear \(expectedCount) times.  Acutal: \(actualKVCount[keyValue] ?? 0)")
+            XCTAssert(actualKVCount[keyValue] == expectedCount, "Expected \(keyValue) to appear \(expectedCount) times.  Actual: \(actualKVCount[keyValue] ?? 0)")
         }
     }