testsys: update log reader to use AsyncBufRead

bottlerocket-os · Aug 2, 2024 · 6f4d624 · 6f4d624
1 parent e98905a
commit 6f4d624
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/tools/testsys/src/logs.rs b/tools/testsys/src/logs.rs
@@ -1,7 +1,7 @@
 use crate::error::{self, Result};
 use clap::Parser;
-use futures::TryStreamExt;
-use snafu::OptionExt;
+use futures::{AsyncBufReadExt, TryStreamExt};
+use snafu::{OptionExt, ResultExt};
 use testsys_model::test_manager::{ResourceState, TestManager};
 use unescape::unescape;
 
@@ -29,15 +29,15 @@ impl Logs {
     pub(crate) async fn run(self, client: TestManager) -> Result<()> {
         match (self.test, self.resource, self.resource_state) {
             (Some(test), None, None) => {
-                let mut logs = client.test_logs(test, self.follow).await?;
-                while let Some(line) = logs.try_next().await? {
-                    println!("{}", unescape(&String::from_utf8_lossy(&line)).context(error::InvalidSnafu{what: "Unable to unescape log string"})?);
+                let mut logs = client.test_logs(test, self.follow).await?.lines();
+                while let Some(line) = logs.try_next().await.context(error::IOSnafu { what: "Failed to read test logs".to_string()})? {
+                    println!("{}", unescape(&line).context(error::InvalidSnafu { what: "Unable to unescape log string"})?);
                 }
             }
             (None, Some(resource), Some(state)) => {
-                let mut logs = client.resource_logs(resource, state, self.follow).await?;
-                while let Some(line) = logs.try_next().await? {
-                    println!("{}", unescape(&String::from_utf8_lossy(&line)).context(error::InvalidSnafu{what: "Unable to unescape log string"})?);
+                let mut logs = client.resource_logs(resource, state, self.follow).await?.lines();
+                while let Some(line) = logs.try_next().await.context(error::IOSnafu { what: "Failed to read test logs".to_string()})? {
+                    println!("{}", unescape(&line).context(error::InvalidSnafu { what: "Unable to unescape log string"})?);
                 }
             }
             _ => return Err(error::Error::Invalid{what: "Invalid arguments were provided. Exactly one of `--test` or `--resource` must be given.".to_string()}),