Merge pull request #61 from Automattic/fix/authorized-key-sync

Fix Authorized Key sync

Author: jkmassel

Sources/hostmgr/commands/sync/SyncAuthorizedKeysCommand.swift

@@ -37,7 +37,7 @@ struct SyncAuthorizedKeysCommand: AsyncParsableCommand, FollowsCommandPolicies {
             bucket: Configuration.shared.authorizedKeysBucket,
             region: Configuration.shared.authorizedKeysRegion,
             credentials: credentials,
-            endpoint: .accelerated
+            endpoint: .default // Secrets doesn't use the accelerated endpoint
         )
 
         guard let object = try await s3Manager.lookupObject(atPath: Constants.s3Key) else {

Sources/libhostmgr/Model/RemoteVMRepository.swift

@@ -74,13 +74,15 @@ public struct RemoteVMRepository {
        try await self.s3Manager.download(
             key: image.checksumObject.key,
             to: destinationDirectory.appendingPathComponent(image.checksumFileName),
+            replacingExistingFile: false,
             progressCallback: nil)
 
         let imageFileDestination = destinationDirectory.appendingPathComponent(image.checksumFileName)
 
         try await self.s3Manager.download(
             key: image.imageObject.key,
             to: destinationDirectory.appendingPathComponent(image.checksumFileName),
+            replacingExistingFile: false,
             progressCallback: progressCallback
         )
 

Sources/libhostmgr/S3Manager.swift

@@ -11,6 +11,7 @@ public protocol S3ManagerProtocol {
     func download(
         key: String,
         to destination: URL,
+        replacingExistingFile shouldReplaceExistingFile: Bool,
         progressCallback: FileTransferProgressCallback?
     ) async throws
 
@@ -19,6 +20,10 @@ public protocol S3ManagerProtocol {
 
 public struct S3Manager: S3ManagerProtocol {
 
+    enum Errors: Error {
+        case fileExistsAtDestination
+    }
+
     private let bucket: String
     private let region: String
 
@@ -41,13 +46,23 @@ public struct S3Manager: S3ManagerProtocol {
     public func download(
         key: String,
         to destination: URL,
+        replacingExistingFile shouldReplaceExistingFile: Bool = true,
         progressCallback: FileTransferProgressCallback?
     ) async throws {
         let tempUrl = try await s3Client.download(
             objectWithKey: key,
             inBucket: self.bucket,
             progressCallback: progressCallback
         )
+
+        if FileManager.default.fileExists(at: destination) {
+            if shouldReplaceExistingFile {
+                try FileManager.default.removeItem(at: destination)
+            } else {
+                throw Errors.fileExistsAtDestination
+            }
+        }
+
         try FileManager.default.moveItem(at: tempUrl, to: destination)
     }