fixup

Author: ethanndickson

Coder Desktop/Coder Desktop/Preview Content/PreviewVPN.swift

@@ -5,25 +5,25 @@ import SwiftUI
 final class PreviewVPN: Coder_Desktop.VPNService {
     @Published var state: Coder_Desktop.VPNServiceState = .connected
     @Published var menuState: VPNMenuState = .init(agents: [
-        UUID(): Agent(id: UUID(), name: "dev", status: .error, fqdns: ["asdf.coder"], wsName: "dogfood2",
+        UUID(): Agent(id: UUID(), name: "dev", status: .error, hosts: ["asdf.coder"], wsName: "dogfood2",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .okay, fqdns: ["asdf.coder"],
+        UUID(): Agent(id: UUID(), name: "dev", status: .okay, hosts: ["asdf.coder"],
                       wsName: "testing-a-very-long-name", wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .warn, fqdns: ["asdf.coder"], wsName: "opensrc",
+        UUID(): Agent(id: UUID(), name: "dev", status: .warn, hosts: ["asdf.coder"], wsName: "opensrc",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "gvisor",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, hosts: ["asdf.coder"], wsName: "gvisor",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "example",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, hosts: ["asdf.coder"], wsName: "example",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .error, fqdns: ["asdf.coder"], wsName: "dogfood2",
+        UUID(): Agent(id: UUID(), name: "dev", status: .error, hosts: ["asdf.coder"], wsName: "dogfood2",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .okay, fqdns: ["asdf.coder"],
+        UUID(): Agent(id: UUID(), name: "dev", status: .okay, hosts: ["asdf.coder"],
                       wsName: "testing-a-very-long-name", wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .warn, fqdns: ["asdf.coder"], wsName: "opensrc",
+        UUID(): Agent(id: UUID(), name: "dev", status: .warn, hosts: ["asdf.coder"], wsName: "opensrc",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "gvisor",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, hosts: ["asdf.coder"], wsName: "gvisor",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "example",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, hosts: ["asdf.coder"], wsName: "example",
                       wsID: UUID()),
     ], workspaces: [:])
     let shouldFail: Bool

Coder Desktop/Coder Desktop/VPNMenuState.swift

@@ -6,7 +6,7 @@ struct Agent: Identifiable, Equatable, Comparable {
     let id: UUID
     let name: String
     let status: AgentStatus
-    let fqdns: [String]
+    let hosts: [String]
     let wsName: String
     let wsID: UUID
 
@@ -18,10 +18,7 @@ struct Agent: Identifiable, Equatable, Comparable {
         return lhs.wsName.localizedCompare(rhs.wsName) == .orderedAscending
     }
 
-    // Choose the shortest hostname, and remove trailing dot if present
-    var primaryHost: String? { fqdns.min(by: { $0.count < $1.count })
-        .map { $0.hasSuffix(".") ? String($0.dropLast()) : $0 }
-    }
+    var primaryHost: String? { hosts.min(by: { $0.count < $1.count }) }
 }
 
 enum AgentStatus: Int, Equatable, Comparable {
@@ -72,7 +69,8 @@ struct VPNMenuState {
             name: agent.name,
             // If last handshake was not within last five minutes, the agent is unhealthy
             status: agent.lastHandshake.date > Date.now.addingTimeInterval(-300) ? .okay : .warn,
-            fqdns: agent.fqdn,
+            // Remove trailing dot if present
+            hosts: agent.fqdn.map { $0.hasSuffix(".") ? String($0.dropLast()) : $0 },
             wsName: wsName,
             wsID: wsID
         )

Coder Desktop/Coder DesktopTests/AgentsTests.swift

@@ -24,7 +24,7 @@ struct AgentsTests {
                 id: UUID(),
                 name: "dev",
                 status: .okay,
-                fqdns: ["a\($0).coder"],
+                hosts: ["a\($0).coder"],
                 wsName: "ws\($0)",
                 wsID: UUID()
             )