[DO NOT MERGE] Test creating 'fingerprints' dir

Sources/Basics/FileSystem+Extensions.swift

@@ -20,11 +20,6 @@ extension FileSystem {
     public var dotSwiftPM: AbsolutePath {
         self.homeDirectory.appending(component: ".swiftpm")
     }
-
-    /// SwiftPM security directory
-    public var swiftPMSecurityDirectory: AbsolutePath {
-        self.dotSwiftPM.appending(component: "security")
-    }
 }
 
 // MARK: - cache
@@ -117,6 +112,19 @@ extension FileSystem {
     }
 }
 
+// MARK: - security
+
+extension FileSystem {
+    /// SwiftPM security directory
+    public var swiftPMSecurityDirectory: AbsolutePath {
+        self.dotSwiftPM.appending(component: "security")
+    }
+
+    public var swiftPMFingerprintsDirectory: AbsolutePath {
+        self.swiftPMSecurityDirectory.appending(component: "fingerprints")
+    }
+}
+
 // MARK: - Utilities
 
 extension FileSystem {

Sources/Commands/SwiftTool.swift

@@ -641,16 +641,18 @@ public class SwiftTool {
         }
     }
 
-    private func getSharedSecurityDirectory() throws -> AbsolutePath? {
+    private func getSharedFingerprintsDirectory() throws -> AbsolutePath? {
         do {
             let fileSystem = localFileSystem
-            let sharedSecurityDirectory = fileSystem.swiftPMSecurityDirectory
-            if !fileSystem.exists(sharedSecurityDirectory) {
-                try fileSystem.createDirectory(sharedSecurityDirectory, recursive: true)
+            let sharedFingerprintsDirectory = fileSystem.swiftPMFingerprintsDirectory
+            if !fileSystem.exists(sharedFingerprintsDirectory) {
+                try fileSystem.createDirectory(sharedFingerprintsDirectory, recursive: true)
             }
-            return sharedSecurityDirectory
+            // And make sure we can lock the directory (which writes a lock file)
+            try fileSystem.withLock(on: sharedFingerprintsDirectory, type: .exclusive) { }
+            return sharedFingerprintsDirectory
         } catch {
-            self.observabilityScope.emit(warning: "Failed creating shared security directory: \(error)")
+            self.observabilityScope.emit(warning: "Failed creating shared fingerprints directory: \(error)")
             return .none
         }
     }
@@ -662,22 +664,20 @@ public class SwiftTool {
         }
 
         let delegate = ToolWorkspaceDelegate(self.outputStream, logLevel: self.logLevel, observabilityScope: self.observabilityScope)
-        let provider = GitRepositoryProvider(processSet: processSet)        
-        // FIXME: rdar://86367436
-        //let sharedSecurityDirectory = try self.getSharedSecurityDirectory()
-        let sharedSecurityDirectory: AbsolutePath? = nil
+        let provider = GitRepositoryProvider(processSet: processSet)
         let sharedCacheDirectory = try self.getSharedCacheDirectory()
         let sharedConfigurationDirectory = try self.getSharedConfigurationDirectory()
+        let sharedFingerprintsDirectory = try self.getSharedFingerprintsDirectory()
         let isXcodeBuildSystemEnabled = self.options.buildSystem == .xcode
         let workspace = try Workspace(
             fileSystem: localFileSystem,
             location: .init(
                 workingDirectory: buildPath,
                 editsDirectory: self.editsDirectory(),
                 resolvedVersionsFile: self.resolvedVersionsFile(),
-                sharedSecurityDirectory: sharedSecurityDirectory,
                 sharedCacheDirectory: sharedCacheDirectory,
-                sharedConfigurationDirectory: sharedConfigurationDirectory
+                sharedConfigurationDirectory: sharedConfigurationDirectory,
+                sharedFingerprintsDirectory: sharedFingerprintsDirectory
             ),
             mirrors: self.getMirrorsConfig(sharedConfigurationDirectory: sharedConfigurationDirectory).mirrors,
             registries: try self.getRegistriesConfig(sharedConfigurationDirectory: sharedConfigurationDirectory).configuration,

Sources/SPMTestSupport/MockWorkspace.swift

@@ -239,9 +239,9 @@ public final class MockWorkspace {
                 workingDirectory: self.sandbox.appending(component: ".build"),
                 editsDirectory: self.sandbox.appending(component: "edits"),
                 resolvedVersionsFile: self.sandbox.appending(component: "Package.resolved"),
-                sharedSecurityDirectory: self.fileSystem.swiftPMSecurityDirectory,  
                 sharedCacheDirectory: self.fileSystem.swiftPMCacheDirectory,
-                sharedConfigurationDirectory: self.fileSystem.swiftPMConfigDirectory
+                sharedConfigurationDirectory: self.fileSystem.swiftPMConfigDirectory,
+                sharedFingerprintsDirectory: self.fileSystem.swiftPMFingerprintsDirectory
             ),
             mirrors: self.mirrors,
             customToolsVersion: self.toolsVersion,

Sources/Workspace/Workspace.swift

@@ -417,9 +417,9 @@ public class Workspace {
                 workingDirectory: dataPath,
                 editsDirectory: editablesPath,
                 resolvedVersionsFile: pinsFile,
-                sharedSecurityDirectory: fileSystem.swiftPMSecurityDirectory,
                 sharedCacheDirectory: cachePath,
-                sharedConfigurationDirectory: nil // legacy
+                sharedConfigurationDirectory: nil, // legacy
+                sharedFingerprintsDirectory: fileSystem.swiftPMFingerprintsDirectory
             ),
             mirrors: config?.mirrors,
             authorizationProvider: netrcFilePath.map {

Sources/Workspace/WorkspaceConfiguration.swift

@@ -30,15 +30,15 @@ extension Workspace {
 
         /// Path to the Package.resolved file.
         public var resolvedVersionsFile: AbsolutePath
-
-        /// Path to the shared security directory
-        public var sharedSecurityDirectory: AbsolutePath?
 
         /// Path to the shared cache directory
         public var sharedCacheDirectory: AbsolutePath?
 
         /// Path to the shared configuration directory
         public var sharedConfigurationDirectory: AbsolutePath?
+
+        /// Path to the shared fingerprints directory
+        public var sharedFingerprintsDirectory: AbsolutePath?
 
         /// Path to the repositories clones.
         public var repositoriesDirectory: AbsolutePath {
@@ -59,11 +59,6 @@ extension Workspace {
         public var artifactsDirectory: AbsolutePath {
             self.workingDirectory.appending(component: "artifacts")
         }
-
-        /// Path to the shared fingerprints directory.
-        public var sharedFingerprintsDirectory: AbsolutePath? {
-            self.sharedSecurityDirectory.map { $0.appending(component: "fingerprints") }
-        }
 
         /// Path to the shared repositories cache.
         public var sharedRepositoriesCacheDirectory: AbsolutePath? {
@@ -96,23 +91,23 @@ extension Workspace {
         ///   - workingDirectory: Path to working directory for this workspace.
         ///   - editsDirectory: Path to store the editable versions of dependencies.
         ///   - resolvedVersionsFile: Path to the Package.resolved file.
-        ///   - sharedSecurityDirectory: Path to the shared security directory.
         ///   - sharedCacheDirectory: Path to the shared cache directory.
         ///   - sharedConfigurationDirectory: Path to the shared configuration directory.
+        ///   - sharedFingerprintsDirectory: Path to the shared fingerprints directory.
         public init(
             workingDirectory: AbsolutePath,
             editsDirectory: AbsolutePath,
             resolvedVersionsFile: AbsolutePath,
-            sharedSecurityDirectory: AbsolutePath?,
             sharedCacheDirectory: AbsolutePath?,
-            sharedConfigurationDirectory: AbsolutePath?
+            sharedConfigurationDirectory: AbsolutePath?,
+            sharedFingerprintsDirectory: AbsolutePath?
         ) {
             self.workingDirectory = workingDirectory
             self.editsDirectory = editsDirectory
             self.resolvedVersionsFile = resolvedVersionsFile
-            self.sharedSecurityDirectory = sharedSecurityDirectory
             self.sharedCacheDirectory = sharedCacheDirectory
             self.sharedConfigurationDirectory = sharedConfigurationDirectory
+            self.sharedFingerprintsDirectory = sharedFingerprintsDirectory
         }
 
         /// Create a new workspace location.
@@ -124,9 +119,9 @@ extension Workspace {
                 workingDirectory: DefaultLocations.workingDirectory(forRootPackage: rootPath),
                 editsDirectory: DefaultLocations.editsDirectory(forRootPackage: rootPath),
                 resolvedVersionsFile: DefaultLocations.resolvedVersionsFile(forRootPackage: rootPath),
-                sharedSecurityDirectory: fileSystem.swiftPMSecurityDirectory,
                 sharedCacheDirectory: fileSystem.swiftPMCacheDirectory,
-                sharedConfigurationDirectory: fileSystem.swiftPMConfigDirectory
+                sharedConfigurationDirectory: fileSystem.swiftPMConfigDirectory,
+                sharedFingerprintsDirectory: fileSystem.swiftPMFingerprintsDirectory
             )
         }
     }