code cleanup

heckj · Dec 31, 2024 · 6c9e2c9 · 6c9e2c9
1 parent bab3073
commit 6c9e2c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Sources/Formic/Commands/VerifyAccess.swift b/Sources/Formic/Commands/VerifyAccess.swift
@@ -53,7 +53,8 @@ public struct VerifyAccess: Command {
                 env: nil,
                 debugPrint: false)
         } else {
-            answer = try await invoker.localShell(cmd: ["echo", "'hello'"], stdIn: nil, env: nil, chdir: nil, debugPrint: false)
+            answer = try await invoker.localShell(
+                cmd: ["echo", "'hello'"], stdIn: nil, env: nil, chdir: nil, debugPrint: false)
         }
         if answer.stdoutString != "hello" {
             return CommandOutput(returnCode: -1, stdOut: nil, stdErr: "Unable to verify access.".data(using: .utf8))

diff --git a/Sources/Formic/DependencyProxies/CommandInvoker.swift b/Sources/Formic/DependencyProxies/CommandInvoker.swift
@@ -115,7 +115,7 @@ struct ProcessCommandInvoker: CommandInvoker {
             task.currentDirectoryURL = URL(fileURLWithPath: chdir)
         }
         task.arguments = cmd
-        
+
         if debugPrint {
             print(task.arguments?.joined(separator: " ") ?? "nil")
         }
@@ -186,7 +186,7 @@ struct ProcessCommandInvoker: CommandInvoker {
 
         args.append(localPath)
         args.append("\(user)@\(host):\(remotePath)")
-        
+
         // loose form:
         // scp -o StrictHostKeyChecking=no get-docker.sh "docker-user@${IP_ADDRESS}:get-docker.sh"
         let rcAndPipe = try await localShell(cmd: args)

diff --git a/Tests/formicTests/CommandInvokerTests.swift b/Tests/formicTests/CommandInvokerTests.swift
@@ -82,9 +82,9 @@ func invokeRemoteCommandWithChdir() async throws {
     .timeLimit(.minutes(1)),
     .tags(.integrationTest))
 func invokeRemoteCommandWithTilde() async throws {
-//    let shellResult = try await ProcessCommandInvoker().remoteShell(
-//        host: "127.0.0.1", user: "heckj", identityFile: "~/.orbstack/ssh/id_ed25519", port: 32222, chdir: "..",
-//        cmd: "mkdir ~/.ssh", env: nil)
+    //    let shellResult = try await ProcessCommandInvoker().remoteShell(
+    //        host: "127.0.0.1", user: "heckj", identityFile: "~/.orbstack/ssh/id_ed25519", port: 32222, chdir: "..",
+    //        cmd: "mkdir ~/.ssh", env: nil)
     let shellResult = try await ProcessCommandInvoker().remoteShell(
         host: "172.190.172.6", user: "docker-user", identityFile: "~/.ssh/bastion_id_ed25519", chdir: nil,
         cmd: "mkdir -p ~/.ssh", env: nil)