T 1250801: Conduit library Enhance Security by Removing #file Usage

mindbody · Sep 13, 2023 · b1a5729 · b1a5729
1 parent 5fa6640
commit b1a5729
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Sources/Conduit/ConduitLogger.swift b/Sources/Conduit/ConduitLogger.swift
@@ -65,23 +65,23 @@ public protocol ConduitLoggerType {
 }
 
 extension ConduitLoggerType {
-    func verbose(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) {
+    func verbose(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) {
         log(block(), level: .verbose, function: function, filePath: filePath, line: line)
     }
 
-    func debug(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) {
+    func debug(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) {
         log(block(), level: .debug, function: function, filePath: filePath, line: line)
     }
 
-    func info(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) {
+    func info(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) {
         log(block(), level: .info, function: function, filePath: filePath, line: line)
     }
 
-    func warn(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) {
+    func warn(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) {
         log(block(), level: .warn, function: function, filePath: filePath, line: line)
     }
 
-    func error(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) {
+    func error(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) {
         log(block(), level: .error, function: function, filePath: filePath, line: line)
     }
 

diff --git a/Tests/ConduitTests/Resource.swift b/Tests/ConduitTests/Resource.swift
@@ -25,7 +25,7 @@ struct Resource {
 
     var path: URL {
         let filename: String = type.isEmpty ? name : "\(name).\(type)"
-        return URL(fileURLWithPath: #file)
+        return URL(fileURLWithPath: #fileID)
             .deletingLastPathComponent()
             .appendingPathComponent("Resources")
             .appendingPathComponent(filename)