Add queue parameter to RegistryManager.discover

Author: mattt

Sources/PackageGraph/CompositePackageContainerProvider.swift

@@ -72,19 +72,11 @@ public class CompositePackageContainerProvider: PackageContainerProvider {
                 }
 
                 let provider = RepositoryPackageContainerProvider(repositoryManager: self.repositoryManager, mirrors: self.mirrors, manifestLoader: self.manifestLoader, currentToolsVersion: self.currentToolsVersion, toolsVersionLoader: self.toolsVersionLoader)
-                provider.getContainer(for: reference, skipUpdate: skipUpdate, on: queue) { result in
-                    queue.async {
-                        completion(result)
-                    }
-                }
+                provider.getContainer(for: reference, skipUpdate: skipUpdate, on: queue, completion: completion)
             }
         } else {
             let provider = LocalPackageContainerProvider(mirrors: self.mirrors, manifestLoader: self.manifestLoader, currentToolsVersion: self.currentToolsVersion, toolsVersionLoader: self.toolsVersionLoader, fileSystem: self.fileSystem)
-            provider.getContainer(for: reference, skipUpdate: skipUpdate, on: queue)  { result in
-                queue.async {
-                    completion(result)
-                }
-            }
+            provider.getContainer(for: reference, skipUpdate: skipUpdate, on: queue, completion: completion)
         }
     }
 }

Sources/PackageGraph/RegistryPackageContainer.swift

@@ -201,7 +201,7 @@ extension RegistryPackageContainerProvider: PackageContainerProvider {
                 completion(.success(container))
             }
         } else {
-            RegistryManager.discover(for: identifier) { result in
+            RegistryManager.discover(for: identifier, on: queue) { result in
                 switch result {
                 case .success(let registryManager):
                     RegistryPackageContainer.create(

Sources/PackageRegistry/RegistryManager.swift

@@ -52,10 +52,13 @@ public final class RegistryManager {
 
     public class func discover(
         for package: PackageReference,
+        on queue: DispatchQueue,
         completion: @escaping (Result<RegistryManager, Error>) -> Void
     ) {
         guard let url = URL(string: "https://\(package.identity)") else {
-            return completion(.failure(RegistryError.invalidURL))
+            return queue.async {
+                completion(.failure(RegistryError.invalidURL))
+            }
         }
 
         do {
@@ -82,9 +85,13 @@ public final class RegistryManager {
                 }
             }
 
-            completion(.success(manager))
+            queue.async {
+                completion(.success(manager))
+            }
         } catch {
-            completion(.failure(error))
+            queue.async {
+                completion(.failure(error))
+            }
         }
     }
 
@@ -188,7 +195,7 @@ public final class RegistryManager {
             method: .get,
             url: url,
             headers: [
-                "Accept": "application/vnd.swift.registry.v1+zip",
+                "Accept": "application/vnd.swift.registry.v1+zip"
             ]
         )
 

Tests/PackageRegistryTests/RegistryManagerTests.swift

@@ -24,7 +24,9 @@ import FoundationNetworking
 #endif
 
 final class RegistryManagerTests: XCTestCase {
-    override func setUp() {
+    private let queue = DispatchQueue(label: "org.swift.registry.tests")
+
+    class override func setUp() {
         PackageModel._useLegacyIdentities = false
 
         RegistryManager.archiverFactory = { _ in
@@ -36,14 +38,16 @@ final class RegistryManagerTests: XCTestCase {
             configuration.protocolClasses = [MockPackageRegistryURLProtocol.self] + (configuration.protocolClasses ?? [])
             return URLSessionHTTPClient(configuration: configuration)
         }
+
+        super.setUp()
     }
 
     func testDiscoverPackageRegistry() {
         let identity = PackageIdentity(url: "https://github.com/mona/LinkedList")
         let package = PackageReference(identity: identity, path: "/LinkedList")
         let expectation = XCTestExpectation(description: "discover package registry")
 
-        RegistryManager.discover(for: package) { result in
+        RegistryManager.discover(for: package, on: queue) { result in
             defer { expectation.fulfill() }
 
             XCTAssertResultSuccess(result)
@@ -58,15 +62,18 @@ final class RegistryManagerTests: XCTestCase {
         let expectation = XCTestExpectation(description: "discover package registry")
         let nestedExpectation = XCTestExpectation(description: "fetch versions")
 
-        RegistryManager.discover(for: package) { result in
+        RegistryManager.discover(for: package, on: queue) { result in
             defer { expectation.fulfill() }
-            guard case .success(let manager) = result else { return }
+            guard case .success(let manager) = result else {
+                return XCTAssertResultSuccess(result)
+            }
 
             manager.fetchVersions(of: package) { result in
                 defer { nestedExpectation.fulfill() }
 
-                XCTAssertResultSuccess(result)
-                guard case .success(let versions) = result else { return }
+                guard case .success(let versions) = result else {
+                    return XCTAssertResultSuccess(result)
+                }
 
                 XCTAssertEqual(versions, ["1.1.1", "1.0.0"])
                 XCTAssertFalse(versions.contains("1.1.0"), "problematic releases shouldn't be included")
@@ -82,17 +89,20 @@ final class RegistryManagerTests: XCTestCase {
         let expectation = XCTestExpectation(description: "discover package registry")
         let nestedExpectation = XCTestExpectation(description: "fetch manifest")
 
-        RegistryManager.discover(for: package) { result in
+        RegistryManager.discover(for: package, on: queue) { result in
             defer { expectation.fulfill() }
-            guard case .success(let manager) = result else { return }
+            guard case .success(let manager) = result else {
+                return XCTAssertResultSuccess(result)
+            }
 
             let manifestLoader = ManifestLoader(manifestResources: Resources.default)
 
             manager.fetchManifest(for: "1.1.1", of: package, using: manifestLoader) { result in
                 defer { nestedExpectation.fulfill() }
 
-                XCTAssertResultSuccess(result)
-                guard case .success(let manifest) = result else { return }
+                guard case .success(let manifest) = result else {
+                    return XCTAssertResultSuccess(result)
+                }
 
                 XCTAssertEqual(manifest.name, "LinkedList")
 
@@ -117,19 +127,20 @@ final class RegistryManagerTests: XCTestCase {
         let identity = PackageIdentity(url: "https://github.com/mona/LinkedList")
         let package = PackageReference(identity: identity, path: "/LinkedList")
         let expectation = XCTestExpectation(description: "discover package registry")
-        let nestedExpectation = XCTestExpectation(description: "fetch manifest")
+        let nestedExpectation = XCTestExpectation(description: "download source archive")
 
-        RegistryManager.discover(for: package) { result in
+        RegistryManager.discover(for: package, on: queue) { result in
             defer { expectation.fulfill() }
-            guard case .success(let manager) = result else { return }
+            guard case .success(let manager) = result else {
+                return XCTAssertResultSuccess(result)
+            }
 
             let fs = InMemoryFileSystem()
-            let path = AbsolutePath("/LinkedList-1.1.1.zip")
+            let path = AbsolutePath("/LinkedList-1.1.1")
             manager.downloadSourceArchive(for: "1.1.1", of: package, into: fs, at: path) { result in
                 defer { nestedExpectation.fulfill() }
 
-                XCTAssertResultSuccess(result)
-                guard case .success = result else { return }
+                guard case .success = result else { return XCTAssertResultSuccess(result) }
 
                 XCTAssertNoThrow {
                     let data = try fs.readFileContents(path)