Fix warnings

Author: finestructure

Sources/App/Controllers/PackageController+routes.swift

@@ -220,7 +220,7 @@ enum PackageController {
                             body: ByteBuffer(data: data)
                         )
                         return response
-                    } catch let fallbackError {
+                    } catch {
                         throw Abort(.notFound)
                     }
                 } else {

Sources/App/Core/Dependencies/HTTPClient.swift

@@ -121,61 +121,55 @@ extension HTTPClient {
             httpClientProvider: .createNew
         )
 
-        defer {
-            Task {
-                try await awsClient.shutdown()
+        return try await run {
+            // Extract region from URL
+            let urlComponents = URLComponents(string: url.string)
+            guard let host = urlComponents?.host else {
+                throw AppError.genericError(nil, "Invalid URL: \(url.string)")
             }
-        }
-
-        // Extract region from URL
-        let urlComponents = URLComponents(string: url.string)
-        guard let host = urlComponents?.host else {
-            throw AppError.genericError(nil, "Invalid URL: \(url.string)")
-        }
 
-        let region = extractRegionFromHost(host) ?? .useast2
-
-        // Get credentials from the credential provider
-        let credentials: Credential
-        do {
-            credentials = try await awsClient.credentialProvider.getCredential(
-                on: awsClient.eventLoopGroup.next(),
-                logger: Logger(label: "aws-credentials")
-            ).get()
-        } catch {
-            throw AppError.genericError(nil, "Failed to retrieve AWS credentials: \(error)")
-        }
+            let region = extractRegionFromHost(host) ?? .useast2
+
+            // Get credentials from the credential provider
+            let credentials: Credential
+            do {
+                credentials = try await awsClient.credentialProvider.getCredential(
+                    on: awsClient.eventLoopGroup.next(),
+                    logger: Logger(label: "aws-credentials")
+                ).get()
+            } catch {
+                throw AppError.genericError(nil, "Failed to retrieve AWS credentials: \(error)")
+            }
 
-        // Use Soto's AWSSigner to sign the request headers
-        let signer = AWSSigner(
-            credentials: credentials,
-            name: "execute-api",
-            region: region.rawValue
-        )
+            // Use Soto's AWSSigner to sign the request headers
+            let signer = AWSSigner(
+                credentials: credentials,
+                name: "execute-api",
+                region: region.rawValue
+            )
 
-        // Create the request URL
-        guard let requestURL = URL(string: url.string) else {
-            throw AppError.genericError(nil, "Invalid URL: \(url.string)")
-        }
+            // Create the request URL
+            guard let requestURL = URL(string: url.string) else {
+                throw AppError.genericError(nil, "Invalid URL: \(url.string)")
+            }
 
-        // Sign the headers for the request
-        let signedHeaders: HTTPHeaders
-        do {
-            signedHeaders = try await signer.signHeaders(
+            // Sign the headers for the request
+            let signedHeaders: HTTPHeaders
+            signedHeaders = signer.signHeaders(
                 url: requestURL,
                 method: HTTPMethod.GET,
                 headers: HTTPHeaders(),
                 body: nil
             )
-        } catch {
-            throw AppError.genericError(nil, "Failed to sign request: \(error)")
-        }
 
-        // Create request with signed headers
-        let request = try Request(url: url.string, method: .GET, headers: signedHeaders)
+            // Create request with signed headers
+            let request = try Request(url: url.string, method: .GET, headers: signedHeaders)
 
-        // Execute the request
-        return try await shared.execute(request: request).get()
+            // Execute the request
+            return try await shared.execute(request: request).get()
+        } defer: {
+            try await awsClient.shutdown()
+        }
     }
 
     private static func extractRegionFromHost(_ host: String) -> Region? {

Sources/App/Core/Gitlab.swift

@@ -163,7 +163,6 @@ extension Gitlab.Builder {
             logger.info("Triggered build: \(res.webUrl)")
             return res
         } catch {
-            let responseBody = response.body?.asString() ?? "nil"
             return .init(status: response.status, webUrl: nil)
         }
     }

Sources/S3Store/S3Store.swift

@@ -69,19 +69,19 @@ public struct S3Store {
             client = AWSClient(credentialProvider: .default,
                               httpClientProvider: .createNew)
         }
-        defer {
-            Task {
-                try await client.shutdown()
-            }
-        }
 
-        let s3 = S3(client: client, region: self.region)
+        return try await run {
+            let s3 = S3(client: client, region: self.region)
 
-        // Create the base URL for the S3 object
-        let baseURL = URL(string: "https://\(key.bucket).s3.\(self.region).amazonaws.com/\(key.path)")!
+            // Create the base URL for the S3 object
+            let baseURL = URL(string: "https://\(key.bucket).s3.\(self.region).amazonaws.com/\(key.path)")!
 
-        let url = try await s3.signURL(url: baseURL, httpMethod: .PUT, expires: .seconds(Int64(expiration)))
-        return url.absoluteString
+            let url = try await s3.signURL(url: baseURL, httpMethod: .PUT, expires: .seconds(Int64(expiration)))
+
+            return url.absoluteString
+        } defer: {
+            try await client.shutdown()
+        }
     }
 
     public func readString(from key: Key) async throws -> String {
@@ -200,3 +200,18 @@ private extension String {
         return String(result)
     }
 }
+
+
+// Copied from ErrorHandlingHelpers.swift in the main module
+@discardableResult
+private func run<T>(_ operation: () async throws -> T,
+            defer deferredOperation: () async throws -> Void) async throws -> T {
+    do {
+        let result = try await operation()
+        try await deferredOperation()
+        return result
+    } catch {
+        try await deferredOperation()
+        throw error
+    }
+}