fix: Fixes issue where linter wasn’t using config file on CI (#458)

* Fixes issue where linter wasn’t using config file on CI

* Exclude Tests dir

* Attempt to fix file exclusions

* Force all file exclusion path variations

* Updates swiftlint github action version

Author: epau

.github/workflows/lint.yml

@@ -25,6 +25,6 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Swift Lint ClientRuntime
-        uses: norio-nomura/action-swiftlint@3.1.0
+        uses: norio-nomura/action-swiftlint@3.2.1
         with:
-          args: --path ./Packages
+          args: --path ./Packages --config ./Packages/.swiftlint.yml

Packages/.swiftlint.yml

@@ -1,6 +1,8 @@
 excluded:
-  - SmithyTestUtil/Tests
-  - ClientRuntime/Tests
+  - ./SmithyTestUtil/*
+  - ./ClientRuntime/Tests/*
+  - ./Packages/SmithyTestUtil/*
+  - ./Packages/ClientRuntime/Tests/*
   - .build
 
 analyzer_rules:
@@ -18,6 +20,7 @@ disabled_rules:
   - file_length
   - syntactic_sugar
   - unused_capture_list
+  - type_body_length
 
 opt_in_rules:
   - empty_count
@@ -41,6 +44,7 @@ identifier_name:
 line_length:
   warning: 120
   error: 160
+  ignores_comments: true
 opening_brace: error
 return_arrow_whitespace: error
 statement_position:

Packages/ClientRuntime/Sources/Middleware/OperationStack.swift

@@ -41,22 +41,29 @@ public struct OperationStack<OperationStackInput,
 
               let result = try await initialize.handle(context: context, input: input)
               guard let output = result.output else {
-                  throw ClientError.unknownError("Something went terribly wrong where the output was not set on the response. Please open a ticket with us at https://github.com/awslabs/aws-sdk-swift")
+                  let errorMessage = [
+                    "Something went terribly wrong where the output was not set on the response.",
+                    "Please open a ticket with us at https://github.com/awslabs/aws-sdk-swift"
+                  ].joined(separator: " ")
+                  throw ClientError.unknownError(errorMessage)
               }
               return output
           }
 
-    mutating public func presignedRequest<H: Handler>(context: HttpContext,
-                                                      input: OperationStackInput,
-                                                      next: H) async throws -> SdkHttpRequestBuilder?
-    where H.Input == SdkHttpRequest,
-          H.Output == OperationOutput<OperationStackOutput>,
-          H.Context == HttpContext {
+    mutating public func presignedRequest<H: Handler>(
+        context: HttpContext,
+        input: OperationStackInput,
+        next: H
+    ) async throws -> SdkHttpRequestBuilder? where
+    H.Input == SdkHttpRequest,
+    H.Output == OperationOutput<OperationStackOutput>,
+    H.Context == HttpContext {
         var builder: SdkHttpRequestBuilder?
-        self.finalizeStep.intercept(position: .after,
-                                    middleware: PresignerShim<OperationStackOutput, OperationStackError>(handler: { buildInMiddleware in
-                                        builder = buildInMiddleware
-                                    }))
+        self.finalizeStep.intercept(
+            position: .after,
+            middleware: PresignerShim<OperationStackOutput, OperationStackError>(handler: { buildInMiddleware in
+                builder = buildInMiddleware
+            }))
         _ = try await handleMiddleware(context: context, input: input, next: next)
         return builder
     }

Packages/ClientRuntime/Sources/Middleware/PresignerShimHandler.swift

@@ -35,7 +35,9 @@ struct PresignerShim<OperationStackOutput: HttpResponseBinding,
                   let output: OperationStackOutput? = try OperationStackOutput(httpResponse: httpResponse, decoder: nil)
                   return .init(httpResponse: httpResponse, output: output)
               } catch {
-                  throw SdkError<OperationStackError>.unknown(ClientError.unknownError("PresignerShimHandler: This code should not execute"))
+                  throw SdkError<OperationStackError>.unknown(
+                    ClientError.unknownError("PresignerShimHandler: This code should not execute")
+                  )
               }
           }
 }

Packages/ClientRuntime/Sources/Networking/Endpoint.swift

@@ -33,7 +33,7 @@ public struct Endpoint: Hashable {
         }
 
         self.init(host: host,
-                  path:  url.path,
+                  path: url.path,
                   port: Int16(url.port ?? 443),
                   queryItems: url.toQueryItems(),
                   protocolType: ProtocolType(rawValue: url.scheme ?? ProtocolType.https.rawValue),

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

@@ -11,13 +11,6 @@ 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
 
@@ -109,7 +102,10 @@ public class CRTClientEngine: HttpClientEngine {
         await serialExecutor.closeAllPendingConnections()
     }
 
-    public func makeHttpRequestStreamOptions(_ request: SdkHttpRequest, _ continuation: StreamContinuation) -> HttpRequestOptions {
+    public func makeHttpRequestStreamOptions(
+        _ request: SdkHttpRequest,
+        _ continuation: StreamContinuation
+    ) -> HttpRequestOptions {
         let response = HttpResponse()
         let crtRequest = request.toHttpRequest(bufferSize: windowSize)
         let streamReader: StreamReader = DataStreamReader()

Packages/ClientRuntime/Sources/Networking/Http/Middlewares/ContentLengthMiddleware.swift

@@ -23,7 +23,7 @@ public struct ContentLengthMiddleware<OperationStackOutput: HttpResponseBinding>
             switch stream {
             case .buffer(let bytes):
                 input.headers.update(name: "Content-Length", value: String(bytes.length))
-            case .reader(_):
+            case .reader:
                 input.headers.update(name: "Transfer-Encoded", value: "Chunked")
             }
         default:

Packages/ClientRuntime/Sources/Networking/Http/Middlewares/MutateHeadersMiddleware.swift

@@ -35,10 +35,8 @@ public struct MutateHeadersMiddleware<OperationStackOutput: HttpResponseBinding>
         }
 
         if !conditionallySet.dictionary.isEmpty {
-            for header in conditionallySet.headers {
-                if !input.headers.exists(name: header.name) {
-                    input.headers.add(name: header.name, values: header.value)
-                }
+            for header in conditionallySet.headers where !input.headers.exists(name: header.name) {
+                input.headers.add(name: header.name, values: header.value)
             }
         }
 

Packages/ClientRuntime/Sources/PrimitiveTypeExtensions/String+Extensions.swift

@@ -116,12 +116,7 @@ extension String {
 
 public extension String {
     func stripFirstMatching(prefixes: [String]) -> String {
-        for prefixToStrip in prefixes {
-            if self.hasPrefix(prefixToStrip) {
-                return self.removePrefix(prefixToStrip)
-            }
-        }
-        return self
+       return prefixes.first(where: hasPrefix(_:)).map(removePrefix(_:)) ?? self
     }
 }
 

Packages/ClientRuntime/Sources/Retries/ExponentialBackOffJitterMode.swift

@@ -16,7 +16,7 @@ public enum ExponentialBackOffJitterMode {
 extension ExponentialBackOffJitterMode {
     func toCRTType() -> CRTExponentialBackoffJitterMode {
         switch self {
-        case .default : return .default
+        case .default: return .default
         case .none: return .none
         case .full: return .full
         case .decorrelated: return .decorrelated