Merge pull request #52 from Automattic/remove/soto-s3

Remove SotoS3 and Alamofire

Author: jkmassel

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -11,13 +11,12 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.1.4"),
-        .package(url: "https://github.com/soto-project/soto.git", from: "6.0.0"),
-        .package(url: "https://github.com/jkmassel/prlctl.git", from: "1.21.0"),
+        .package(url: "https://github.com/jkmassel/tinys3.git", branch: "main"),
+        .package(url: "https://github.com/jkmassel/prlctl.git", from: "1.22.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/jkmassel/kcpassword-swift.git", from: "1.0.0"),
         .package(url: "https://github.com/swiftpackages/DotEnv.git", from: "3.0.0"),
         .package(url: "https://github.com/apple/swift-tools-support-core", from: "0.2.5"),
-        .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.6.1")),
         .package(url: "https://github.com/vapor/console-kit.git", .upToNextMajor(from: "4.5.0")),
     ],
     targets: [
@@ -36,9 +35,8 @@ let package = Package(
             name: "libhostmgr",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "SotoS3", package: "soto"),
                 .product(name: "TSCBasic", package: "swift-tools-support-core"),
-                .product(name: "Alamofire", package: "Alamofire"),
+                .product(name: "tinys3", package: "tinys3"),
                 .product(name: "ConsoleKit", package: "console-kit"),
                 .product(name: "prlctl", package: "prlctl"),
             ]

Package.swift

@@ -1,6 +1,7 @@
 import Foundation
 import ArgumentParser
 import libhostmgr
+import tinys3
 
 struct SyncAuthorizedKeysCommand: AsyncParsableCommand, FollowsCommandPolicies {
 
@@ -30,9 +31,13 @@ struct SyncAuthorizedKeysCommand: AsyncParsableCommand, FollowsCommandPolicies {
 
         Console.heading("Syncing Authorized Keys")
 
-        let s3Manager = S3Manager(
+        let credentials = try AWSCredentials.fromUserConfiguration()
+
+        let s3Manager = try S3Manager(
             bucket: Configuration.shared.authorizedKeysBucket,
-            region: Configuration.shared.authorizedKeysRegion
+            region: Configuration.shared.authorizedKeysRegion,
+            credentials: credentials,
+            endpoint: .accelerated
         )
 
         guard let object = try await s3Manager.lookupObject(atPath: Constants.s3Key) else {
@@ -43,7 +48,7 @@ struct SyncAuthorizedKeysCommand: AsyncParsableCommand, FollowsCommandPolicies {
         let progressBar = Console.startFileDownload(object)
 
         try await s3Manager.download(
-            object: object,
+            key: object.key,
             to: destination,
             progressCallback: progressBar.update
         )

Sources/hostmgr/commands/sync/SyncAuthorizedKeysCommand.swift

@@ -1,5 +1,6 @@
 import Foundation
 import ConsoleKit
+import tinys3
 
 public struct Console {
 

Sources/libhostmgr/CLI/Console.swift

@@ -1,5 +1,4 @@
 import Foundation
-import SotoS3
 import ArgumentParser
 
 public struct Configuration: Codable {
@@ -35,15 +34,15 @@ public struct Configuration: Codable {
 
     /// VM Remote Image Settings
     public var vmImagesBucket: String = ""
-    public var vmImagesRegion: String = SotoS3.Region.useast1.rawValue
+    public var vmImagesRegion: String = "us-east-1"
 
     /// Images that are protected from deletion (useful for local work, or for a fallback image)
     public var protectedImages: [String] = []
 
     /// authorized_keys file sync
     public var authorizedKeysSyncInterval = Defaults.defaultAuthorizedKeysRefreshInterval
     public var authorizedKeysBucket = ""
-    public var authorizedKeysRegion: String = SotoS3.Region.useast1.rawValue
+    public var authorizedKeysRegion: String = "us-east-1"
 
     /// git repo mirroring
     public var gitMirrorBucket = ""
@@ -84,15 +83,15 @@ public struct Configuration: Codable {
         )
 
         vmImagesBucket = try values.decode(String.self, forKey: .vmImagesBucket)
-        vmImagesRegion = try values.decode(Region.self, forKey: .vmImagesRegion).rawValue
+        vmImagesRegion = try values.decode(String.self, forKey: .vmImagesRegion)
 
         protectedImages = values.decode(
             forKey: .protectedImages,
             defaultingTo: [])
 
         authorizedKeysSyncInterval = values.decode(forKey: .authorizedKeysSyncInterval, defaultingTo: 3600)
         authorizedKeysBucket = try values.decode(String.self, forKey: .authorizedKeysBucket)
-        authorizedKeysRegion = try values.decode(Region.self, forKey: .authorizedKeysRegion).rawValue
+        authorizedKeysRegion = try values.decode(String.self, forKey: .authorizedKeysRegion)
 
         gitMirrorBucket = try values.decode(String.self, forKey: .gitMirrorBucket)
         gitMirrorPort = values.decode(

Sources/libhostmgr/Model/Configuration.swift

@@ -1,44 +1,28 @@
 import Foundation
+import tinys3
 
 public struct RemoteVMImage: FilterableByBasename {
     public let imageObject: S3Object
     public let checksumObject: S3Object
 
-    public var imagePath: String {
-        imageObject.key
-    }
-
     public var fileName: String {
-        URL(fileURLWithPath: imagePath)
+        URL(fileURLWithPath: imageObject.key)
             .lastPathComponent
     }
 
     public var basename: String {
-        URL(fileURLWithPath: imagePath)
+        URL(fileURLWithPath: imageObject.key)
             .deletingPathExtension()
             .lastPathComponent
     }
 
-    public var checksumKey: String {
-        checksumObject.key
-    }
-
     public var checksumFileName: String {
         basename + ".sha256.txt"
     }
-
-    public init(imageObject: S3Object, checksumKey: String) {
-        self.imageObject = imageObject
-        self.checksumObject = S3Object(
-            key: checksumKey,
-            size: 64, // Checksums are always 64 bytes
-            modifiedAt: .now
-        )
-    }
 }
 
 extension RemoteVMImage: Equatable {
     public static func == (lhs: RemoteVMImage, rhs: RemoteVMImage) -> Bool {
-        lhs.imageObject == rhs.imageObject && lhs.checksumKey == rhs.checksumKey
+        lhs.imageObject == rhs.imageObject && lhs.checksumObject == rhs.checksumObject
     }
 }