Remove AppEnvironment.httpClient and setHTTPClient

Author: finestructure

Sources/App/Core/AppEnvironment.swift

@@ -36,14 +36,12 @@ struct AppEnvironment: Sendable {
     var gitlabPipelineLimit: @Sendable () -> Int
     var hideStagingBanner: @Sendable () -> Bool
     var maintenanceMessage: @Sendable () -> String?
-    var httpClient: @Sendable () -> Client
     var loadSPIManifest: @Sendable (String) -> SPIManifest.Manifest?
     var logger: @Sendable () -> Logger
     var metricsPushGatewayUrl: @Sendable () -> String?
     var plausibleBackendReportingSiteID: @Sendable () -> String?
     var processingBuildBacklog: @Sendable () -> Bool
     var runnerIds: @Sendable () -> [String]
-    var setHTTPClient: @Sendable (Client) -> Void
     var setLogger: @Sendable (Logger) -> Void
     var shell: Shell
     var siteURL: @Sendable () -> String
@@ -65,7 +63,6 @@ struct AppEnvironment: Sendable {
 
 
 extension AppEnvironment {
-    nonisolated(unsafe) static var httpClient: Client!
     nonisolated(unsafe) static var logger: Logger!
 
     static let live = AppEnvironment(
@@ -96,7 +93,6 @@ extension AppEnvironment {
         maintenanceMessage: {
             Environment.get("MAINTENANCE_MESSAGE").flatMap(\.trimmed)
         },
-        httpClient: { httpClient },
         loadSPIManifest: { path in SPIManifest.Manifest.load(in: path) },
         logger: { logger },
         metricsPushGatewayUrl: { Environment.get("METRICS_PUSHGATEWAY_URL") },
@@ -110,7 +106,6 @@ extension AppEnvironment {
                 .flatMap { try? JSONDecoder().decode([String].self, from: $0) }
             ?? []
         },
-        setHTTPClient: { client in Self.httpClient = client },
         setLogger: { logger in Self.logger = logger },
         shell: .live,
         siteURL: { Environment.get("SITE_URL") ?? "http://localhost:8080" },

Sources/App/configure.swift

@@ -27,7 +27,6 @@ public func configure(_ app: Application) async throws -> String {
 
     app.logger.component = "server"
     Current.setLogger(app.logger)
-    Current.setHTTPClient(app.client)
 
     // It will be tempting to uncomment/re-add these lines in the future. We should not enable
     // server-side compression as long as we pass requests through Cloudflare, which compresses

Tests/AppTests/Mocks/AppEnvironment+mock.swift

@@ -35,14 +35,12 @@ extension AppEnvironment {
             gitlabPipelineLimit: { Constants.defaultGitlabPipelineLimit },
             hideStagingBanner: { false },
             maintenanceMessage: { nil },
-            httpClient: { httpClient },
             loadSPIManifest: { _ in nil },
             logger: { logger },
             metricsPushGatewayUrl: { "http://pushgateway:9091" },
             plausibleBackendReportingSiteID: { nil },
             processingBuildBacklog: { false },
             runnerIds: { [] },
-            setHTTPClient: { client in Self.httpClient = client },
             setLogger: { logger in Self.logger = logger },
             shell: .mock,
             siteURL: { Environment.get("SITE_URL") ?? "http://localhost:8080" },