WIP: Use only FoundationEssentials

Benchmark/Sources/soto-benchmark/AWSClientSuite.swift

@@ -14,10 +14,15 @@
 
 import Benchmark
 import Dispatch
-import Foundation
 import NIO
 import SotoCore
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 struct RequestThrowMiddleware: AWSServiceMiddleware {
     struct Error: Swift.Error {}
 

Benchmark/Sources/soto-benchmark/AWSSignerV4Suite.swift

@@ -13,9 +13,14 @@
 //===----------------------------------------------------------------------===//
 
 import Benchmark
-import Foundation
 import SotoSignerV4
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 let awsSignerV4Suite = BenchmarkSuite(name: "AWSSignerV4", settings: Iterations(1000), WarmupIterations(2)) { suite in
     let string = "testing, testing, 1,2,1,2"
     let credentials: Credential = StaticCredential(accessKeyId: "MYACCESSKEY", secretAccessKey: "MYSECRETACCESSKEY")

Benchmark/Sources/soto-benchmark/EncoderSuites.swift

@@ -13,9 +13,14 @@
 //===----------------------------------------------------------------------===//
 
 import Benchmark
-import Foundation
 import SotoCore
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 #if compiler(>=5.10)
 internal import SotoXML
 #else

Package.swift

@@ -64,6 +64,7 @@ let package = Package(
                 .product(name: "NIOFoundationCompat", package: "swift-nio"),
                 .product(name: "JMESPath", package: "jmespath.swift"),
                 .product(name: "Tracing", package: "swift-distributed-tracing"),
+                "SotoUtils",
             ],
             swiftSettings: swiftSettings
         ),
@@ -73,9 +74,15 @@ let package = Package(
                 .product(name: "Crypto", package: "swift-crypto"),
                 .product(name: "NIOCore", package: "swift-nio"),
                 .product(name: "NIOHTTP1", package: "swift-nio"),
+                "SotoUtils",
             ],
             swiftSettings: swiftSettings
         ),
+        .target(
+            name: "SotoUtils",
+            dependencies: [],
+            swiftSettings: swiftSettings
+        ),
         .target(
             name: "SotoTestUtils",
             dependencies: [

Sources/SotoCore/Concurrency/EventStream.swift

@@ -12,9 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import NIOCore
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 /// AsyncSequence of Event stream events
 public struct AWSEventStream<Event: Sendable>: Sendable {
     let base: AnyAsyncSequence<ByteBuffer>

Sources/SotoCore/Concurrency/ExpiringValue.swift

@@ -12,9 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import Logging
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 /// Type holding a value and an expiration value.
 ///
 /// When accessing the value you have to provide a closure that will update the

Sources/SotoCore/Credential/ConfigFileLoader.swift

@@ -12,12 +12,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import INIParser
 import Logging
 import NIOCore
 import NIOPosix
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 /// Load settings from AWS credentials and profile configuration files
 /// https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html
 enum ConfigFileLoader {

Sources/SotoCore/Encoder/EventStreamDecoder.swift

@@ -12,9 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import NIOCore
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 #if compiler(>=5.10)
 internal import SotoXML
 #else

Sources/SotoCore/HTTP/AWSHTTPBody.swift

@@ -12,11 +12,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import Logging
 import NIOCore
 import NIOHTTP1
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 /// Storage for HTTP body which can be either a ByteBuffer or an AsyncSequence of
 /// ByteBuffers
 public struct AWSHTTPBody: Sendable {

Sources/SotoCore/Middleware/Middleware/LoggingMiddleware.swift

@@ -12,10 +12,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import Logging
 import NIOHTTP1
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 /// Middleware that outputs the contents of requests being sent to AWS and the contents of the responses received.
 public struct AWSLoggingMiddleware: AWSMiddlewareProtocol {
     @usableFromInline

Sources/SotoCore/Middleware/Middleware/S3Middleware.swift

@@ -13,9 +13,14 @@
 //===----------------------------------------------------------------------===//
 
 import Crypto
-import Foundation
 @_spi(SotoInternal) import SotoSignerV4
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 #if compiler(>=5.10)
 internal import SotoXML
 #else
@@ -114,10 +119,10 @@ public struct S3Middleware: AWSMiddlewareProtocol {
         }
     }
 
-    static let s3PathAllowedCharacters = CharacterSet.urlPathAllowed.subtracting(.init(charactersIn: "+@()&$=:,'!*"))
+    static let s3PathAllowedCharacters = String.s3PathAllowedCharacters
     /// percent encode path value.
     private static func urlEncodePath(_ value: String) -> String {
-        value.addingPercentEncoding(withAllowedCharacters: Self.s3PathAllowedCharacters) ?? value
+        value.addingPercentEncoding(utf8Buffer: value.utf8, allowedCharacters: Self.s3PathAllowedCharacters)
     }
 
     func createBucketFixup(request: inout AWSHTTPRequest, context: AWSMiddlewareContext) {

Sources/SotoCore/RetryPolicy.swift

@@ -13,11 +13,16 @@
 //===----------------------------------------------------------------------===//
 
 import AsyncHTTPClient
-import Foundation
 import NIOCore
 import NIOHTTP1
 import NIOPosix  // Needed for NIOConnectionError
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 /// Creates a RetryPolicy for AWSClient to use
 public struct RetryPolicyFactory {
     public let retryPolicy: RetryPolicy

Sources/SotoCore/Waiters/AWSClient+Waiter.swift

@@ -13,9 +13,22 @@
 //===----------------------------------------------------------------------===//
 
 import Dispatch
-import Foundation
 import NIOCore
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
+#if canImport(Darwin)
+import Darwin.C
+#elseif canImport(Musl)
+import Musl
+#elseif canImport(Glibc)
+import Glibc
+#endif
+
 // MARK: Waiters
 
 extension AWSClient {

Sources/SotoSignerV4/signer.swift

@@ -13,7 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 import Crypto
+import SotoUtils
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import struct Foundation.CharacterSet
 import struct Foundation.Data
 import struct Foundation.Date
@@ -22,6 +26,7 @@ import struct Foundation.Locale
 import struct Foundation.TimeZone
 import struct Foundation.URL
 import struct Foundation.URLComponents
+#endif
 
 /// Amazon Web Services V4 Signer
 public struct AWSSigner: Sendable {
@@ -34,7 +39,9 @@ public struct AWSSigner: Sendable {
 
     static let hashedEmptyBody = SHA256.hash(data: [UInt8]()).hexDigest()
 
+    #if !canImport(FoundationEssentials)
     private static let timeStampDateFormatter: DateFormatter = createTimeStampDateFormatter()
+    #endif
 
     /// Initialise the Signer class with AWS credentials
     public init(credentials: Credential, name: String, region: String) {
@@ -336,7 +343,7 @@ public struct AWSSigner: Sendable {
         let canonicalHeaders = signingData.headersToSign
             .map { (key: $0.key.lowercased(), value: $0.value) }
             .sorted { $0.key < $1.key }
-            .map { return "\($0.key):\($0.value.trimmingCharacters(in: CharacterSet.whitespaces).removeSequentialWhitespace())" }
+            .map { return "\($0.key):\($0.value.trimming(while: { $0.isWhitespace }).removeSequentialWhitespace())" }
             .joined(separator: "\n")
         let canonicalPath: String
         let urlComps = URLComponents(url: signingData.unsignedURL, resolvingAgainstBaseURL: false)!
@@ -399,6 +406,7 @@ public struct AWSSigner: Sendable {
         }
     }
 
+    #if !canImport(FoundationEssentials)
     /// create timestamp dateformatter
     private static func createTimeStampDateFormatter() -> DateFormatter {
         let formatter = DateFormatter()
@@ -407,11 +415,19 @@ public struct AWSSigner: Sendable {
         formatter.locale = Locale(identifier: "en_US_POSIX")
         return formatter
     }
+    #endif
 
+    #if canImport(FoundationEssentials)
     /// return a timestamp formatted for signing requests
     static func timestamp(_ date: Date) -> String {
-        self.timeStampDateFormatter.string(from: date)
+        date.formatted(Date.ISO8601FormatStyle(dateSeparator: .omitted, timeSeparator: .omitted))
     }
+    #else
+    /// return a timestamp formatted for signing requests
+    static func timestamp(_ date: Date) -> String {
+        timeStampDateFormatter.string(from: date)
+    }
+    #endif
 
     /// returns port from URL. If port is set to 80 on an http url or 443 on an https url nil is returned
     private static func port(from url: URL) -> Int? {
@@ -426,29 +442,6 @@ public struct AWSSigner: Sendable {
     }
 }
 
-extension String {
-    func queryEncode() -> String {
-        addingPercentEncoding(withAllowedCharacters: String.queryAllowedCharacters) ?? self
-    }
-
-    func s3PathEncode() -> String {
-        addingPercentEncoding(withAllowedCharacters: String.s3PathAllowedCharacters) ?? self
-    }
-
-    func uriEncode() -> String {
-        addingPercentEncoding(withAllowedCharacters: String.uriAllowedCharacters) ?? self
-    }
-
-    func uriEncodeWithSlash() -> String {
-        addingPercentEncoding(withAllowedCharacters: String.uriAllowedWithSlashCharacters) ?? self
-    }
-
-    static let s3PathAllowedCharacters = CharacterSet.urlPathAllowed.subtracting(.init(charactersIn: "+@()&$=:,'!*"))
-    static let uriAllowedWithSlashCharacters = CharacterSet(charactersIn: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~/")
-    static let uriAllowedCharacters = CharacterSet(charactersIn: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~")
-    static let queryAllowedCharacters = CharacterSet(charactersIn: "/;+").inverted
-}
-
 @_spi(SotoInternal)
 extension Sequence<UInt8> {
     /// return a hexEncoded string buffer from an array of bytes
@@ -485,7 +478,7 @@ extension URL {
     }
 }
 
-extension String {
+extension StringProtocol {
     fileprivate func removeSequentialWhitespace() -> String {
         reduce(into: "") { result, character in
             if result.last?.isWhitespace != true || character.isWhitespace == false {

Sources/SotoTestUtils/TestUtils.swift

@@ -13,11 +13,16 @@
 //===----------------------------------------------------------------------===//
 
 import AsyncHTTPClient
-import Foundation
 import Logging
 import SotoCore
 import XCTest
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 @propertyWrapper public struct EnvironmentVariable<Value: LosslessStringConvertible> {
     var defaultValue: Value
     var variableName: String