Merge pull request #35 from SwiftPackageIndex/update-soto-s3-file-transfer

Bump soto-s3-file-transfer to 2.x

Author: finestructure

.gitignore

@@ -9,3 +9,4 @@ DerivedData/
 .netrc
 /.lambda/
 /.vscode/
+.swiftpm/

Package.resolved

@@ -39,7 +39,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "0.1.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "1.0.0-alpha.1"),
-        .package(url: "https://github.com/soto-project/soto-s3-file-transfer.git", from: "1.2.0"),
+        .package(url: "https://github.com/soto-project/soto-s3-file-transfer.git", from: "2.0.0"),
         .package(url: "https://github.com/vapor-community/Zip.git", from: "2.0.0"),
         .package(url: "https://github.com/pointfreeco/swift-dependencies.git", from: "1.0.0")
     ],

Package.swift

@@ -44,7 +44,7 @@ Instead, use the `dev` environment to validate a new release as follows:
 - Run the tests
 
     ```
-    docker run --rm -v "$PWD":/host -w /host swift:5.10.0-amazonlinux2 swift test
+    docker run --rm -v "$PWD":/host -w /host swift:6.0.3-amazonlinux2 swift test
     ```
 
 - Deploy the new version to the "test" lambda

README.md

@@ -48,16 +48,11 @@ public struct DocUploader: LambdaHandler {
         }
         self.httpClient = httpClient
 
-        let awsClient = AWSClient(httpClientProvider: .shared(httpClient))
+        let awsClient = AWSClient(httpClient: httpClient)
         context.terminator.register(name: "awsclient") { eventLoop in
             let promise = eventLoop.makePromise(of: Void.self)
-            awsClient.shutdown() { error in
-                switch error {
-                case .none:
-                    promise.succeed(())
-                case .some(let error):
-                    promise.fail(error)
-                }
+            promise.completeWithTask {
+                try await awsClient.shutdown()
             }
             return promise.futureResult
         }

Sources/DocUploader/DocUploader.swift

@@ -20,7 +20,7 @@ import SotoS3FileTransfer
 struct LiveS3Client: S3Client {
     func deleteFile(client: AWSClient, logger: Logger, key: S3StoreKey) async throws {
         let s3 = S3(client: client, region: .useast2)
-        let s3FileTransfer = S3FileTransferManager(s3: s3, threadPoolProvider: .singleton)
+        let s3FileTransfer = S3FileTransferManager(s3: s3)
 
         guard let file = S3File(key: key) else {
             throw Error(message: "Invalid key: \(key)")
@@ -30,7 +30,7 @@ struct LiveS3Client: S3Client {
 
     func loadFile(client: AWSClient, logger: Logger, from key: S3StoreKey, to path: String) async throws {
         let s3 = S3(client: client, region: .useast2)
-        let s3FileTransfer = S3FileTransferManager(s3: s3, threadPoolProvider: .singleton)
+        let s3FileTransfer = S3FileTransferManager(s3: s3)
 
         guard let file = S3File(key: key) else {
             throw Error(message: "Invalid key: \(key)")
@@ -44,26 +44,17 @@ struct LiveS3Client: S3Client {
                     timeout: .seconds(60),
                     options: .s3DisableChunkedUploads)
 
-        let threadPool = NIOThreadPool(numberOfThreads: 8)
-        defer { threadPool.shutdownGracefully { _ in } }
-        threadPool.start()
-
-        let s3FileTransfer = S3FileTransferManager(s3: s3,
-                                                   threadPoolProvider: .shared(threadPool),
-                                                   configuration: .init(maxConcurrentTasks: 60))
-        defer {
-            try? s3FileTransfer.syncShutdown()
-        }
+        let s3FileTransfer = S3FileTransferManager(s3: s3, configuration: .init(maxConcurrentTasks: 60))
 
         guard let s3Folder = S3Folder(url: key.url) else {
             throw Error(message: "Invalid key: \(key)")
         }
 
-        var nextProgressTick = 0.1
+        let nextProgressTick = QueueIsolated(0.1)
         try await s3FileTransfer.sync(from: folder, to: s3Folder, delete: true) { progress in
-            if progress >= nextProgressTick {
+            if progress >= nextProgressTick.value {
                 logger.info("Syncing... [\(percent: progress)]")
-                nextProgressTick += 0.1
+                nextProgressTick.withValue { $0 += 0.1 }
             }
         }
     }

Sources/DocUploader/LiveS3Client.swift

@@ -0,0 +1,69 @@
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import Foundation
+
+
+// Modeled after ActorIsolated with synchronisation via a queue instead of an actor, allowing
+// sync access where async isn't possible.
+
+@dynamicMemberLookup
+public final class QueueIsolated<Value: Sendable>: @unchecked Sendable {
+    private let _queue = DispatchQueue(label: "queue-isolated")
+
+    private var _value: Value
+
+    public init(_ value: Value) {
+        self._value = value
+    }
+
+    public var value: Value {
+        get {
+            _queue.sync { self._value }
+        }
+    }
+
+    public subscript<Subject>(dynamicMember keyPath: KeyPath<Value, Subject>) -> Subject {
+        _queue.sync {
+            self._value[keyPath: keyPath]
+        }
+    }
+
+    public func withValue<T>(
+        _ operation: (inout Value) throws -> T
+    ) rethrows -> T {
+        try _queue.sync {
+            var value = self._value
+            defer { self._value = value }
+            return try operation(&value)
+        }
+    }
+
+    public func setValue(_ newValue: Value) {
+        _queue.async {
+            self._value = newValue
+        }
+    }
+}
+
+
+extension QueueIsolated where Value == Int {
+    public func increment(by delta: Int = 1) {
+        withValue { $0 += delta }
+    }
+
+    public func decrement(by delta: Int = 1) {
+        withValue { $0 -= delta }
+    }
+}

Sources/DocUploader/QueueIsolated.swift

@@ -22,5 +22,5 @@ docker run \
   --rm \
   --volume "$(pwd):/src" \
   --workdir "/src" \
-  swift:5.10.0-amazonlinux2 \
+  swift:6.0.3-amazonlinux2 \
   swift build --disable-automatic-resolution --product "$executable" -c release --static-swift-stdlib #-Xswiftc -cross-module-optimization