chore: Project cleanup (#437)

Author: jbelkins

.gitignore

@@ -18,4 +18,5 @@ Package.resolved
 **/xcuserdata
 **/*.xcuserdata
 xcuserdata
-.build/
+.build/
+.vscode

CircleciScripts/pre_start_iOS_simulator.sh

@@ -1,40 +1,37 @@
 // swift-tools-version:5.4
+
 import PackageDescription
-let excludes = ["README.md"]
+
 
 let package = Package(
     name: "ClientRuntime",
     platforms: [
-    .macOS(.v10_15),
-    .iOS(.v13)
+        .macOS(.v10_15),
+        .iOS(.v13)
     ],
     products: [
         .library(name: "ClientRuntime", targets: ["ClientRuntime"]),
         .library(name: "SmithyTestUtil", targets: ["SmithyTestUtil"])
     ],
     dependencies: [
-        .package(name: "AwsCrt", url: "https://github.com/awslabs/aws-crt-swift.git", from: "0.2.2"),
+        .package(url: "https://github.com/awslabs/aws-crt-swift.git", from: "0.2.2"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/MaxDesiatov/XMLCoder.git", from: "0.13.0")
     ],
     targets: [
         .target(
             name: "ClientRuntime",
             dependencies: [
-                .product(name: "AwsCommonRuntimeKit", package: "AwsCrt"),
+                .product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "XMLCoder", package: "XMLCoder")
             ],
-            path: "./Packages/ClientRuntime/Sources",
-            exclude: excludes
+            path: "./Packages/ClientRuntime/Sources"
         ),
         .testTarget(
             name: "ClientRuntimeTests",
-            dependencies: [
-	        "ClientRuntime",
-	        "SmithyTestUtil"
-	    ],
-	    path: "./Packages/ClientRuntime/Tests"
+            dependencies: ["ClientRuntime", "SmithyTestUtil"],
+            path: "./Packages/ClientRuntime/Tests"
         ),
         .target(
             name: "SmithyTestUtil",

Package.swift

@@ -11,6 +11,13 @@ import Darwin
 #endif
 
 public class CRTClientEngine: HttpClientEngine {
+
+    // Swiftlint is treating this `actor` declaration as a function.
+    // I am not sure but I think it is because Swiftlint is out-of-date
+    // on our CI.  Until CI can be updated, I am disabling the warning
+    // generated by this actor declaration.
+    //
+    // swiftlint:disable:next function_body_length
     actor SerialExecutor {
         private var logger: LogAgent
 
@@ -92,13 +99,9 @@ public class CRTClientEngine: HttpClientEngine {
         let connection = try await connectionMgr.acquireConnection()
         self.logger.debug("Connection was acquired to: \(String(describing: request.endpoint.url?.absoluteString))")
         return try await withCheckedThrowingContinuation({ (continuation: StreamContinuation) in
-            do {
-                let requestOptions = makeHttpRequestStreamOptions(request, continuation)
-                let stream = try connection.makeRequest(requestOptions: requestOptions)
-                try stream.activate()
-            } catch {
-                continuation.resume(throwing: error)
-            }
+            let requestOptions = makeHttpRequestStreamOptions(request, continuation)
+            let stream = connection.makeRequest(requestOptions: requestOptions)
+            stream.activate()
         })
     }
 

Packages/ClientRuntime/ClientRuntime.h

@@ -24,7 +24,9 @@ public struct URLPathMiddleware<OperationStackInput: URLPathProvider,
           Self.MOutput == H.Output,
           Self.Context == H.Context {
               guard var urlPath = input.urlPath else {
-                  throw SdkError<OperationStackError>.client(ClientError.pathCreationFailed("Creating the url path failed, a required property in the path was nil"))
+                let message = "Creating the url path failed, a required property in the path was nil"
+                let innerError = ClientError.pathCreationFailed(message)
+                throw SdkError<OperationStackError>.client(innerError)
               }
               if let urlPrefix = urlPrefix, !urlPrefix.isEmpty {
                   urlPath = "\(urlPrefix)\(urlPath)"

Packages/ClientRuntime/Info.plist

@@ -58,11 +58,14 @@ extension SdkHttpRequest: CustomDebugStringConvertible, CustomStringConvertible
     }
 
     public var debugDescription: String {
-        return "\(method.rawValue.uppercased()) \(endpoint.protocolType ?? ProtocolType.https):\(endpoint.port) \n Path: \(endpoint.path), \n \(headers) \n \(String(describing: queryItems))"
+        description
     }
 
     public var description: String {
-        return "\(method.rawValue.uppercased()) \(endpoint.protocolType ?? ProtocolType.https):\(endpoint.port) \n Path: \(endpoint.path) \n \(headers) \n \(String(describing: queryItems))"
+        let method = method.rawValue.uppercased()
+        let protocolType = endpoint.protocolType ?? ProtocolType.https
+        let query = String(describing: queryItems)
+        return "\(method) \(protocolType):\(endpoint.port) \n Path: \(endpoint.path) \n \(headers) \n \(query)"
     }
 }
 

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

@@ -81,7 +81,8 @@ struct FormURLKeyedEncoding<Key: CodingKey>: KeyedEncodingContainerProtocol {
         try value.encode(to: stringsEncoding)
     }
 
-    mutating func nestedContainer<NestedKey: CodingKey>(keyedBy keyType: NestedKey.Type, forKey key: Key) -> KeyedEncodingContainer<NestedKey> {
+    mutating func nestedContainer<NestedKey: CodingKey>(keyedBy keyType: NestedKey.Type,
+                                                        forKey key: Key) -> KeyedEncodingContainer<NestedKey> {
         var container = FormURLKeyedEncoding<NestedKey>(to: data)
         container.codingPath = codingPath + [key]
         return KeyedEncodingContainer(container)