Update Workspace initialization to configure registryManager

Author: mattt

Sources/Commands/SwiftTool.swift

@@ -560,6 +560,7 @@ public class SwiftTool {
                 sharedConfigurationDirectory: sharedConfigurationDirectory
             ),
             mirrors: self.getMirrorsConfig(sharedConfigurationDirectory: sharedConfigurationDirectory).mirrors,
+            registries: try? self.getRegistriesConfig().configuration,
             authorizationProvider: self.getAuthorizationProvider(),
             customManifestLoader: self.getManifestLoader(), // FIXME: doe we really need to customize it?
             customRepositoryProvider: provider, // FIXME: doe we really need to customize it?

Sources/Workspace/Workspace.swift

@@ -258,11 +258,13 @@ public class Workspace {
         fileSystem: FileSystem,
         location: Location,
         mirrors: DependencyMirrors? = .none,
+        registries: RegistryConfiguration? = .none,
         authorizationProvider: AuthorizationProvider? = .none,
         customToolsVersion: ToolsVersion? = .none,
         customManifestLoader: ManifestLoaderProtocol? = .none,
         customRepositoryManager: RepositoryManager? = .none,
         customRepositoryProvider: RepositoryProvider? = .none,
+        customRegistryManager: RegistryManager? = .none,
         customIdentityResolver: IdentityResolver? = .none,
         customHTTPClient: HTTPClient? = .none,
         customArchiver: Archiver? = .none,
@@ -281,6 +283,8 @@ public class Workspace {
             toolchain: UserToolchain(destination: .hostDestination()).configuration,
             cacheDir: location.sharedManifestsCacheDirectory
         )
+        let mirrors = mirrors ?? DependencyMirrors()
+        let identityResolver = customIdentityResolver ?? DefaultIdentityResolver(locationMapper: mirrors.effectiveURL(for:))
         let repositoryProvider = customRepositoryProvider ?? GitRepositoryProvider()
         let sharedRepositoriesCacheEnabled = sharedRepositoriesCacheEnabled ?? true
         let repositoryManager = customRepositoryManager ?? RepositoryManager(
@@ -290,10 +294,15 @@ public class Workspace {
             delegate: delegate.map(WorkspaceRepositoryManagerDelegate.init(workspaceDelegate:)),
             cachePath: sharedRepositoriesCacheEnabled ? location.sharedRepositoriesCacheDirectory : .none
         )
+        let registryManager = customRegistryManager ?? registries.map { configuration in
+            RegistryManager(configuration: configuration,
+                            identityResolver: identityResolver,
+                            authorizationProvider: authorizationProvider?.httpAuthorizationHeader(for:),
+                            diagnosticEngine: nil)
+        }
         let httpClient = customHTTPClient ?? HTTPClient()
         let archiver = customArchiver ?? ZipArchiver()
-        let mirrors = mirrors ?? DependencyMirrors()
-        let identityResolver = customIdentityResolver ?? DefaultIdentityResolver(locationMapper: mirrors.effectiveURL(for:))
+
         var checksumAlgorithm = customChecksumAlgorithm ?? SHA256()
         #if canImport(CryptoKit)
         if checksumAlgorithm is SHA256, #available(macOS 10.15, *) {
@@ -318,6 +327,7 @@ public class Workspace {
         self.httpClient = httpClient
         self.archiver = archiver
         self.repositoryManager = repositoryManager
+        self.registryManager = registryManager
         self.identityResolver = identityResolver
         self.checksumAlgorithm = checksumAlgorithm