Drop logHandler from withApp

# Conflicts:
#	Tests/AppTests/Helpers/TestSupport.swift

Author: finestructure

Tests/AppTests/AnalyzeErrorTests.swift

@@ -62,10 +62,11 @@ extension AllTests.AnalyzeErrorTests {
 
     @Test func analyze_refreshCheckout_failed() async throws {
         let capturingLogger = CapturingLogger()
-        try await withApp(setup, defaultDependencies, logHandler: capturingLogger) { app in
+        try await withApp(setup, defaultDependencies) { app in
             try await withDependencies {
                 $0.environment.loadSPIManifest = { _ in nil }
                 $0.fileManager.fileExists = { @Sendable _ in true }
+                $0.logger.set(to: capturingLogger)
                 $0.shell.run = { @Sendable cmd, path in
                     switch cmd {
                         case _ where cmd.description.contains("git clone https://github.com/foo/1"):
@@ -95,10 +96,11 @@ extension AllTests.AnalyzeErrorTests {
 
     @Test func analyze_updateRepository_invalidPackageCachePath() async throws {
         let capturingLogger = CapturingLogger()
-        try await withApp(setup, defaultDependencies, logHandler: capturingLogger) { app in
+        try await withApp(setup, defaultDependencies) { app in
             try await withDependencies {
                 $0.environment.loadSPIManifest = { _ in nil }
                 $0.fileManager.fileExists = { @Sendable _ in true }
+                $0.logger.set(to: capturingLogger)
             } operation: {
                 // setup
                 let pkg = try await Package.find(badPackageID, on: app.db).unwrap()
@@ -124,10 +126,11 @@ extension AllTests.AnalyzeErrorTests {
 
     @Test func analyze_getPackageInfo_gitCheckout_error() async throws {
         let capturingLogger = CapturingLogger()
-        try await withApp(setup, defaultDependencies, logHandler: capturingLogger) { app in
+        try await withApp(setup, defaultDependencies) { app in
             try await withDependencies {
                 $0.environment.loadSPIManifest = { _ in nil }
                 $0.fileManager.fileExists = { @Sendable _ in true }
+                $0.logger.set(to: capturingLogger)
                 $0.shell.run = { @Sendable cmd, path in
                     switch cmd {
                         case .gitCheckout(branch: "main", quiet: true) where path.hasSuffix("foo-1"):
@@ -154,7 +157,7 @@ extension AllTests.AnalyzeErrorTests {
 
     @Test func analyze_dumpPackage_missing_manifest() async throws {
         let capturingLogger = CapturingLogger()
-        try await withApp(setup, defaultDependencies, logHandler: capturingLogger) { app in
+        try await withApp(setup, defaultDependencies) { app in
             try await withDependencies {
                 $0.environment.loadSPIManifest = { _ in nil }
                 $0.fileManager.fileExists = { @Sendable path in
@@ -163,6 +166,7 @@ extension AllTests.AnalyzeErrorTests {
                     }
                     return true
                 }
+                $0.logger.set(to: capturingLogger)
             } operation: {
                 // MUT
                 try await Analyze.analyze(client: app.client,

Tests/AppTests/AnalyzerTests.swift

@@ -1441,7 +1441,7 @@ extension AllTests.AnalyzerTests {
         // Ensure `latest` remains set in case of AppError.noValidVersions
         // https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/2571
         let capturingLogger = CapturingLogger()
-        try await withApp(logHandler: capturingLogger) { app in
+        try await withApp { app in
             try await withDependencies {
                 $0.date.now = .now
                 $0.fileManager.fileExists = { @Sendable _ in true }
@@ -1456,6 +1456,7 @@ extension AllTests.AnalyzerTests {
                 1\tPerson 2
                 """
                 }
+                $0.logger.set(to: capturingLogger)
                 $0.shell.run = { @Sendable _, _ in return "" }
             } operation: {
                 let pkgId = UUID()

Tests/AppTests/ErrorReportingTests.swift

@@ -37,13 +37,14 @@ extension AllTests.ErrorReportingTests {
 
     @Test func Ingestion_error_reporting() async throws {
         let capturingLogger = CapturingLogger()
-        try await withApp(logHandler: capturingLogger) { app in
+        try await withApp { app in
             // setup
             try await Package(id: .id0, url: "1", processingStage: .reconciliation).save(on: app.db)
 
             try await withDependencies {
                 $0.date.now = .now
                 $0.github.fetchMetadata = { @Sendable _, _ throws(Github.Error) in throw Github.Error.invalidURL("1") }
+                $0.logger.set(to: capturingLogger)
             } operation: {
                 // MUT
                 try await Ingestion.ingest(client: app.client, database: app.db, mode: .limit(10))
@@ -61,14 +62,15 @@ extension AllTests.ErrorReportingTests {
         let capturingLogger = CapturingLogger()
         try await withDependencies {
             $0.fileManager.fileExists = { @Sendable _ in true }
+            $0.logger.set(to: capturingLogger)
             $0.shell.run = { @Sendable cmd, _ in
                 if cmd.description == "git tag" { return "1.0.0" }
                 // returning a blank string will cause an exception when trying to
                 // decode it as the manifest result - we use this to simulate errors
                 return "invalid"
             }
         } operation: {
-            try await withApp(logHandler: capturingLogger) { app in
+            try await withApp { app in
                 // setup
                 try await Package(id: .id1, url: "1".asGithubUrl.url, processingStage: .ingestion).save(on: app.db)
 

Tests/AppTests/Helpers/TestSupport.swift

@@ -21,7 +21,6 @@ import PostgresNIO
 
 func withApp(_ setup: (Application) async throws -> Void = { _ in },
              _ updateValuesForOperation: (inout DependencyValues) async throws -> Void = { _ in },
-             logHandler: LogHandler? = nil,
              environment: Environment = .testing,
              _ test: (Application) async throws -> Void) async throws {
     try await TestSupport.setupDb(environment)
@@ -30,11 +29,7 @@ func withApp(_ setup: (Application) async throws -> Void = { _ in },
     return try await run {
         try await setup(app)
         try await withDependencies(updateValuesForOperation) {
-            try await withDependencies {
-                $0.logger.set(to: logHandler)
-            } operation: {
-                try await test(app)
-            }
+            try await test(app)
         }
     } defer: {
         try await app.asyncShutdown()

Tests/AppTests/IngestionTests.swift

@@ -383,7 +383,7 @@ extension AllTests.IngestionTests {
         // Test error behaviour when two packages resolving to the same owner/name are ingested:
         //   - don't create repository records
         let capturingLogger = CapturingLogger()
-        try await withApp(logHandler: capturingLogger) { app in
+        try await withApp { app in
             // setup
             try await Package(id: .id0, url: "https://github.com/foo/0", status: .ok, processingStage: .reconciliation)
                 .save(on: app.db)
@@ -413,6 +413,7 @@ extension AllTests.IngestionTests {
                         summary: "desc")
                 }
                 $0.github.fetchReadme = { @Sendable _, _ in nil }
+                $0.logger.set(to: capturingLogger)
             } operation: {
                 // MUT
                 try await Ingestion.ingest(client: app.client, database: app.db, mode: .limit(10))