Only publish git mirrors once

Author: jkmassel

Sources/hostmgr/commands/cache/GitMirrorFetchCommand.swift

@@ -31,13 +31,13 @@ struct GitMirrorFetchCommand: AsyncParsableCommand {
         if try !gitMirror.archiveExistsLocally {
             Console.info("Fetching the Git Mirror for \(gitMirror.url)")
 
-            guard let server = try await servers.first(havingFileAtPath: gitMirror.remoteFilename) else {
+            guard let server = try await servers.first(havingFileNamed: gitMirror.remoteFilename) else {
                 Console.exit("No Git Mirror found for \(gitMirror.slug)", style: .error)
             }
 
             let progress = Console.startProgress("Downloading Git Mirror", type: .download)
             try await server.downloadFile(
-                at: gitMirror.remoteFilename,
+                named: gitMirror.remoteFilename,
                 to: gitMirror.archivePath,
                 progress: progress.update
             )

Sources/hostmgr/commands/cache/GitMirrorPublishCommand.swift

@@ -10,7 +10,7 @@ struct GitMirrorPublishCommand: AsyncParsableCommand {
     )
 
     @Option(
-        help: "The URL to the Git repository that will be fetched"
+        help: "The URL to the Git repository that will be cached"
     )
     var gitMirror: GitMirror?
 
@@ -30,7 +30,7 @@ struct GitMirrorPublishCommand: AsyncParsableCommand {
             Console.exit("There is no local Git Mirror at \(gitMirror.localPath)", style: .error)
         }
 
-        guard try await !server.hasFile(at: gitMirror.remoteFilename) else {
+        guard try await !server.hasFile(named: gitMirror.remoteFilename) else {
             Console.exit("Remote mirror already exists – exiting", style: .error)
         }
 

Sources/hostmgr/commands/sync/SyncAuthorizedKeysCommand.swift

@@ -37,13 +37,13 @@ struct SyncAuthorizedKeysCommand: AsyncParsableCommand, FollowsCommandPolicies {
 
         Console.heading("Syncing Authorized Keys")
 
-        guard try await server.hasFile(at: Constants.s3Key) else {
+        guard try await server.hasFile(named: Constants.s3Key) else {
             Console.error("Unable to locate authorized_keys file – exiting")
             throw ExitCode(rawValue: 1)
         }
 
         let progressBar = Console.startProgress("Downloading `authorized_keys`", type: .download)
-        try await server.downloadFile(at: Constants.s3Key, to: destination, progress: progressBar.update)
+        try await server.downloadFile(named: Constants.s3Key, to: destination, progress: progressBar.update)
 
         // Fix the permissions on the file, if needed
         Console.info("Setting file permissions on \(destination)")

Sources/libhostmgr/Platforms/RemoteVMLibrary.swift

@@ -47,7 +47,7 @@ public struct RemoteVMLibrary {
     }
 
     public func hasImage(named name: String) async throws -> Bool {
-        try await listImages(sortedBy: .name).contains(where: { $0.name == name })
+        try await S3Server.vmImages.hasFile(named: name)
     }
 
     public func lookupImage(named name: String) async throws -> RemoteVMImage {
@@ -73,14 +73,14 @@ public struct RemoteVMLibrary {
             throw HostmgrError.notEnoughLocalDiskSpaceToDownloadFile(image.fileName, image.size, availableStorageSpace)
         }
 
-        guard let server = try await servers.first(havingFileAtPath: image.fileName) else {
+        guard let server = try await servers.first(havingFileNamed: image.fileName) else {
             throw HostmgrError.unableToFindRemoteImage(name)
         }
 
         let destination = Paths.vmImageStorageDirectory.appendingPathComponent(image.fileName)
 
         try await server.downloadFile(
-            at: image.fileName,
+            named: image.fileName,
             to: destination,
             progress: progressCallback
         )

Sources/libhostmgr/Servers/CacheServer.swift

@@ -70,8 +70,8 @@ public struct CacheServer: ReadableRemoteFileProvider {
         self.basePath = path
     }
 
-    public func hasFile(at path: String) async throws -> Bool {
-        guard let url = baseURL?.appendingPathComponent(path) else {
+    public func hasFile(named name: String) async throws -> Bool {
+        guard let url = baseURL?.appendingPathComponent(name) else {
             return false
         }
 
@@ -85,11 +85,11 @@ public struct CacheServer: ReadableRemoteFileProvider {
     }
 
     public func downloadFile(
-        at path: String,
+        named name: String,
         to destination: URL,
         progress: @escaping ProgressCallback)
     async throws {
-        guard let url = baseURL?.appendingPathComponent(path) else {
+        guard let url = baseURL?.appendingPathComponent(name) else {
             preconditionFailure("Don't try to download a file without checking if it exists first")
         }
 

Sources/libhostmgr/Servers/RemoteFileProvider.swift

@@ -1,22 +1,22 @@
 import Foundation
 
 public protocol RemoteFileProvider {
-    func hasFile(at path: String) async throws -> Bool
+    func hasFile(named name: String) async throws -> Bool
 }
 
 public protocol ReadableRemoteFileProvider: RemoteFileProvider {
-    func downloadFile(at path: String, to destination: URL, progress: @escaping ProgressCallback) async throws
+    func downloadFile(named name: String, to destination: URL, progress: @escaping ProgressCallback) async throws
 }
 
 protocol WritableRemoteFileProvider: RemoteFileProvider {
     func uploadFile(at source: URL, to destination: String, progress: @escaping ProgressCallback) async throws
 }
 
 public extension [ReadableRemoteFileProvider] {
-    func first(havingFileAtPath path: String) async throws -> ReadableRemoteFileProvider? {
+    func first(havingFileNamed name: String) async throws -> ReadableRemoteFileProvider? {
         for server in self {
             do {
-                if try await server.hasFile(at: path) {
+                if try await server.hasFile(named: name) {
                     return server
                 }
             } catch {

Sources/libhostmgr/Servers/S3Server.swift

@@ -18,7 +18,7 @@ public struct S3Server: RemoteFileProvider {
 
     public static let vmImages: S3Server = S3Server(
         bucketName: Configuration.shared.vmImagesBucket,
-        prefix: "images",
+        prefix: "images/",
         endpoint: .accelerated
     )
 
@@ -32,8 +32,14 @@ public struct S3Server: RemoteFileProvider {
         try await s3Client.list(bucket: bucketName, prefix: prefix ?? "/").objects.map(self.convert)
     }
 
-    public func hasFile(at path: String) async throws -> Bool {
-        try await listFiles().contains { $0.path.hasPrefix(path) }
+    public func hasFile(named name: String) async throws -> Bool {
+        do {
+            let object = try await s3Client.head(bucket: bucketName, key: key(fromName: name))
+            return object != nil
+        } catch let err {
+            debugPrint(err.localizedDescription)
+            return false
+        }
     }
 
     var s3Client: S3Client {
@@ -45,12 +51,16 @@ public struct S3Server: RemoteFileProvider {
     func convert(_ s3Object: S3Object) -> RemoteFile {
         RemoteFile(size: s3Object.size, path: s3Object.key, lastModifiedAt: s3Object.lastModifiedAt)
     }
+
+    func key(fromName name: String) -> String {
+        "\(self.prefix ?? "/")\(name)"
+    }
 }
 
 extension S3Server: ReadableRemoteFileProvider {
-    public func downloadFile(at path: String, to destination: URL, progress: @escaping ProgressCallback) async throws {
+    public func downloadFile(named name: String, to destination: URL, progress: @escaping ProgressCallback) async throws {
         let tempUrl = try await s3Client.download(
-            objectWithKey: path,
+            objectWithKey: key(fromName: name),
             inBucket: self.bucketName,
             progressCallback: progress
         )