Log cleanup (#92)

* removing duplicate log statements, compressing log info to a single line for raw command display in debugging

* removing commented out optional dependencies from experiments

Author: heckj

Package.swift

@@ -18,14 +18,11 @@ let package = Package(
             url: "https://github.com/apple/swift-async-dns-resolver",
             .upToNextMajor(from: "0.1.0")
         ),
-        // .package(url: "https://github.com/Zollerboy1/SwiftCommand.git", from: "1.4.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.13.0"),
         .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.0.0"),
         .package(url: "https://github.com/swiftlang/swift-format.git",
             .upToNextMajor(from: "600.0.0")),
-        //.package(url: "https://github.com/orlandos-nl/Citadel/", from: "0.9.0"),
-        //.package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "2.1.0"),
         .package(url: "https://github.com/neallester/swift-log-testing.git", from: "0.0.1"),
     ],
     targets: [
@@ -34,13 +31,9 @@ let package = Package(
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "AsyncDNSResolver", package: "swift-async-dns-resolver"),
-                // .product(name: "SwiftCommand", package: "SwiftCommand"),
                 .product(name: "Parsing", package: "swift-parsing"),
                 .product(name: "Dependencies", package: "swift-dependencies"),
                 .product(name: "Logging", package: "swift-log"),
-                //.product(name: "Citadel", package: "Citadel"),
-                //.product(name: "Crypto", package: "swift-crypto"),
-                //.product(name: "_CryptoExtras", package: "swift-crypto"),
             ]
         ),
         .testTarget(

Sources/Formic/DependencyProxies/ProcessCommandInvoker.swift

@@ -41,8 +41,7 @@ struct ProcessCommandInvoker: CommandInvoker {
         let cmdString = "'\(cmd.joined(separator: " "))'"
         task.arguments = ["-c", cmdString]
 
-        logger?.trace("RAW LOCAL COMMAND:")
-        logger?.trace("/bin/sh -c \(cmdString)")
+        logger?.trace("FORKED PROCESS: /bin/sh -c \(cmdString)")
 
         let stdOutPipe = Pipe()
         let stdErrPipe = Pipe()

Sources/Formic/Engine/Engine.swift

@@ -100,7 +100,6 @@ public actor Engine {
             numberOfRetries += 1
             let start = clock.now
             do {
-                logger?.debug("running command \(command) against \(host)")
                 outputOfLastAttempt = try await command.run(host: host, logger: logger)
                 // - DISABLED execution timeout checking because it's hanging when
                 // the process that invokes the commands is Foundation.process, which is all

examples/updateExample/Sources/updateExample.swift

@@ -34,14 +34,12 @@ struct configureBastion: AsyncParsableCommand {
         try await engine.run(
             host: bastionHost, displayProgress: true, detailLevel: detailLevel,
             commands: [
-                SSHCommand("uname -a"),  // uses CitadelSSH
-                SSHCommand("ls -altr"),
-
                 ShellCommand("mkdir -p ~/.ssh"),  // uses Process and forked 'ssh' locally
                 ShellCommand("chmod 0700 ~/.ssh"),
                 CopyInto(location: "~/.ssh/\(keyName)", from: privateKeyLocation),
                 CopyInto(location: "~/.ssh/\(keyName).pub", from: "\(privateKeyLocation).pub"),
                 ShellCommand("chmod 0600 ~/.ssh/\(keyName)"),
+                
                 // CopyFrom(into: "swiftly-install.sh", from: URL(string: "https://swiftlang.github.io/swiftly/swiftly-install.sh")!),
                 // ShellCommand("chmod 0755 swiftly-install.sh"),
                 // released version (0.3.0) doesn't support Ubuntu 24.04 - that's pending in 0.4.0...
@@ -54,10 +52,10 @@ struct configureBastion: AsyncParsableCommand {
                 ShellCommand("sudo apt-get update -q", env: debUnattended),
                 ShellCommand("sudo apt-get upgrade -y -qq", env: debUnattended),
 
-                // latest upgrade looks like it _doesn't_ require a reboot to complete its work.
-                //            ShellCommand("sudo reboot"),
-                //            VerifyAccess(ignoreFailure: false,
-                //                        retry: Backoff(maxRetries: 10, strategy: .fibonacci(maxDelay: .seconds(10)))),
+                // A reboot and "wait for it" to resume setup:
+                //    ShellCommand("sudo reboot"),
+                //    VerifyAccess(ignoreFailure: false,
+                //                retry: Backoff(maxRetries: 10, strategy: .fibonacci(maxDelay: .seconds(10)))),
 
                 // "manual install" of Swift
                 // from https://www.swift.org/install/linux/tarball/ for Ubuntu 24.04
@@ -82,18 +80,14 @@ struct configureBastion: AsyncParsableCommand {
                 // restart the unattended upgrades
                 ShellCommand("sudo systemctl start unattended-upgrades.service"),
 
-                // yes, I know about Swiftly, but when I'm creating this it wasn't available
-                // on swift.org and the released version wasn't yet supporting Ubuntu 24.04.
-
                 ShellCommand(
                     "wget -nv  https://download.swift.org/swift-6.0.3-release/ubuntu2404/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-ubuntu24.04.tar.gz"
                 ),
-                // ~17 seconds
+                
                 ShellCommand("tar xzf swift-6.0.3-RELEASE-ubuntu24.04.tar.gz"),
-                // ~43 seconds
+                
                 ShellCommand("swift-6.0.3-RELEASE-ubuntu24.04/usr/bin/swift -version"),
 
-                // reboot to full apply pending updates
                 ShellCommand("sudo reboot"),
             ])
     }