working with custom netrc file location

Author: sstadelman

Package.swift

@@ -20,7 +20,7 @@ let macOSPlatform: SupportedPlatform
 if let deploymentTarget = ProcessInfo.processInfo.environment["SWIFTPM_MACOS_DEPLOYMENT_TARGET"] {
     macOSPlatform = .macOS(deploymentTarget)
 } else {
-    macOSPlatform = .macOS(.v10_10)
+    macOSPlatform = .macOS(.v10_13)
 }
 
 let package = Package(

Sources/Commands/Options.swift

@@ -111,6 +111,9 @@ public class ToolOptions {
         // Force the Xcode build system if we want to build more than one arch.
         archs.count > 1 ? .xcode : _buildSystem
     }
+    
+    /// The location of the netrc file which should be use for authentication when downloading binary target artifacts
+    public var netrcFilePath: AbsolutePath?
 
     public var _buildSystem: BuildSystemKind = .native
 

Sources/Commands/SwiftTool.swift

@@ -10,6 +10,7 @@
 
 import func Foundation.NSUserName
 import class Foundation.ProcessInfo
+import func Foundation.NSHomeDirectory
 import Dispatch
 
 import TSCLibc
@@ -472,6 +473,12 @@ public class SwiftTool<Options: ToolOptions> {
         binder.bind(
             option: parser.add(option: "--build-system", kind: BuildSystemKind.self, usage: nil),
             to: { $0._buildSystem = $1 })
+        
+        binder.bind(
+            option: parser.add(
+                option: "--netrc-file", kind: PathArgument.self,
+                usage: "Absolute path to netrc file for downloading binary target artifacts"),
+            to: { $0.netrcFilePath = $1.path })
 
         // Let subclasses bind arguments.
         type(of: self).defineArguments(parser: parser, binder: binder)
@@ -601,6 +608,10 @@ public class SwiftTool<Options: ToolOptions> {
     private lazy var _swiftpmConfig: Result<SwiftPMConfig, Swift.Error> = {
         return Result(catching: { SwiftPMConfig(path: try configFilePath()) })
     }()
+    
+    func resolvedNetrcFilePath() -> AbsolutePath? {
+        return options.netrcFilePath ?? AbsolutePath("\(NSHomeDirectory())/.netrc")
+    }
 
     /// Holds the currently active workspace.
     ///
@@ -626,6 +637,7 @@ public class SwiftTool<Options: ToolOptions> {
             delegate: delegate,
             config: try getSwiftPMConfig(),
             repositoryProvider: provider,
+            netrcFilePath: resolvedNetrcFilePath(),
             isResolverPrefetchingEnabled: options.shouldEnableResolverPrefetching,
             skipUpdate: options.skipDependencyUpdate,
             enableResolverTrace: options.enableResolverTrace

Sources/SPMTestSupport/MockDownloader.swift

@@ -49,6 +49,7 @@ public class MockDownloader: Downloader {
     public func downloadFile(
         at url: Foundation.URL,
         to destinationPath: AbsolutePath,
+        withAuthorizationProvider authorizationProvider: AuthorizationProviding?,
         progress: @escaping Downloader.Progress,
         completion: @escaping Downloader.Completion
     ) {

Sources/Workspace/Workspace.swift

@@ -346,6 +346,8 @@ public class Workspace {
 
     /// The downloader used for downloading binary artifacts.
     fileprivate let downloader: Downloader
+    
+    fileprivate let netrcFilePath: AbsolutePath?
 
     /// The downloader used for unarchiving binary artifacts.
     fileprivate let archiver: Archiver
@@ -396,6 +398,7 @@ public class Workspace {
         fileSystem: FileSystem = localFileSystem,
         repositoryProvider: RepositoryProvider = GitRepositoryProvider(),
         downloader: Downloader = FoundationDownloader(),
+        netrcFilePath: AbsolutePath? = nil,
         archiver: Archiver = ZipArchiver(),
         checksumAlgorithm: HashAlgorithm = SHA256(),
         additionalFileRules: [FileRuleDescription] = [],
@@ -412,6 +415,7 @@ public class Workspace {
         self.currentToolsVersion = currentToolsVersion
         self.toolsVersionLoader = toolsVersionLoader
         self.downloader = downloader
+        self.netrcFilePath = netrcFilePath
         self.archiver = archiver
         self.checksumAlgorithm = checksumAlgorithm
         self.isResolverPrefetchingEnabled = isResolverPrefetchingEnabled
@@ -1400,6 +1404,8 @@ extension Workspace {
         let group = DispatchGroup()
         let tempDiagnostics = DiagnosticsEngine()
 
+        let netrc = try? Netrc.load(fromFileAtPath: netrcFilePath).get()
+        
         for artifact in artifacts {
             group.enter()
 
@@ -1418,9 +1424,12 @@ extension Workspace {
 
             let parsedURL = URL(string: url)!
             let archivePath = parentDirectory.appending(component: parsedURL.lastPathComponent)
+            
+            
             downloader.downloadFile(
                 at: parsedURL,
                 to: archivePath,
+                withAuthorizationProvider: netrc,
                 progress: { bytesDownloaded, totalBytesToDownload in
                     self.delegate?.downloadingBinaryArtifact(
                         from: url,

Tests/CommandsTests/PackageToolTests.swift

@@ -41,6 +41,10 @@ final class PackageToolTests: XCTestCase {
     func testVersion() throws {
         XCTAssert(try execute(["--version"]).stdout.contains("Swift Package Manager"))
     }
+    
+    func testNetrcFile() throws {
+        XCTAssert(try execute(["--netrc-file", "/Users/me/.hidden/.netrc"]).stdout.contains("Absolute path to netrc file"))
+    }
 
     func testResolve() throws {
         fixture(name: "DependencyResolution/External/Simple") { prefix in