Refactor logic for getRegistriesConfig helper

Author: mattt

Sources/Commands/SwiftPackageRegistryTool.swift

@@ -153,17 +153,18 @@ public struct SwiftPackageRegistryTool: ParsableCommand {
 
 
 private extension SwiftTool {
-    func getRegistriesConfig(sharedConfigurationDirectory: AbsolutePath? = nil) throws -> Workspace.Configuration.Registries {
-        let sharedConfigurationDirectory = try sharedConfigurationDirectory ?? self.getSharedConfigurationDirectory()
-        let sharedRegistriesFile = sharedConfigurationDirectory.map { Workspace.DefaultLocations.registriesConfigurationFile(at: $0) }
+    func getRegistriesConfig() throws -> Workspace.Configuration.Registries {
+        let localRegistriesFile = try Workspace.DefaultLocations.registriesConfigurationFile(at: self.getPackageRoot())
+
+        let workspace = try getActiveWorkspace()
+        let sharedRegistriesFile = workspace.location.sharedConfigurationDirectory.map {
+            Workspace.DefaultLocations.registriesConfigurationFile(at: $0)
+        }
+
         return try .init(
-            localRegistriesFile: self.registriesConfigFile(),
+            localRegistriesFile: localRegistriesFile,
             sharedRegistriesFile: sharedRegistriesFile,
             fileSystem: localFileSystem
         )
     }
-
-    func registriesConfigFile() throws -> AbsolutePath {
-        try self.getPackageRoot().appending(components: ".swiftpm", "config", "registries.json")
-    }
 }

Sources/Commands/SwiftTool.swift

@@ -536,7 +536,7 @@ public class SwiftTool {
         return netrcFilePath
     }
 
-    func getSharedCacheDirectory() throws -> AbsolutePath? {
+    private func getSharedCacheDirectory() throws -> AbsolutePath? {
         if let explicitCachePath = options.cachePath {
             // Create the explicit cache path if necessary
             if !localFileSystem.exists(explicitCachePath) {
@@ -553,7 +553,7 @@ public class SwiftTool {
         }
     }
 
-    func getSharedConfigurationDirectory() throws -> AbsolutePath? {
+    private func getSharedConfigurationDirectory() throws -> AbsolutePath? {
         if let explicitConfigPath = options.configPath {
             // Create the explicit config path if necessary
             if !localFileSystem.exists(explicitConfigPath) {