Move CompositeAuthorizationProvider to SwiftTool

Author: yim-lee

Sources/Basics/AuthorizationProvider.swift

@@ -269,8 +269,10 @@ public struct CompositeAuthorizationProvider: AuthorizationProvider {
                 switch provider {
                 case let provider as NetrcAuthorizationProvider:
                     ObservabilitySystem.topScope.emit(info: "Credentials for \(url) found in netrc file at \(provider.path)")
+#if canImport(Security)
                 case is KeychainAuthorizationProvider:
                     ObservabilitySystem.topScope.emit(info: "Credentials for \(url) found in keychain")
+#endif
                 default:
                     ObservabilitySystem.topScope.emit(info: "Credentials for \(url) found in \(provider)")
                 }

Sources/Commands/SwiftTool.swift

@@ -493,8 +493,16 @@ public class SwiftTool {
     }
 
     func getAuthorizationProvider() throws -> AuthorizationProvider? {
-        // currently only single provider: netrc
-        return try self.getNetrcConfig()?.get()
+        var providers = [AuthorizationProvider]()
+        // netrc file has higher specificity than keychain so use it first
+        if let workspaceNetrc = try self.getNetrcConfig()?.get() {
+            providers.append(workspaceNetrc)
+        }
+#if canImport(Security)
+        providers.append(KeychainAuthorizationProvider())
+#endif
+        return CompositeAuthorizationProvider(providers)
+
     }
 
     func getNetrcConfig() -> Workspace.Configuration.Netrc? {

Sources/Workspace/WorkspaceConfiguration.swift

@@ -350,13 +350,7 @@ extension Workspace.Configuration {
         }
 
         private static func load(_ path: AbsolutePath, fileSystem: FileSystem) throws -> AuthorizationProvider {
-            var providers = [AuthorizationProvider]()
-            // netrc file has higher specificity than keychain so use it first
-            providers.append(try NetrcAuthorizationProvider(path: path, fileSystem: fileSystem))
-#if canImport(Security)
-            providers.append(KeychainAuthorizationProvider())
-#endif
-            return CompositeAuthorizationProvider(providers)
+            try NetrcAuthorizationProvider(path: path, fileSystem: fileSystem)
         }
     }
 }