example: bugfix, clean up output

Author: pchickey

aws/examples/s3.rs

@@ -41,7 +41,10 @@ async fn main() -> Result<()> {
     let client = Client::new(&config);
 
     match opts.command.as_ref().unwrap_or(&Command::List) {
-        Command::List => list(&opts, &client).await,
+        Command::List => {
+            let output = list(&opts, &client).await?;
+            print!("{}", output);
+        }
         Command::Get { key, out } => {
             let contents = get(&opts, &client, key).await?;
             let output: &str = if let Some(out) = out {
@@ -50,24 +53,25 @@ async fn main() -> Result<()> {
                 key.as_str()
             };
             std::fs::write(output, contents)?;
-            Ok(())
         }
     }
+    Ok(())
 }
 
-async fn list(opts: &Opts, client: &Client) -> Result<()> {
+async fn list(opts: &Opts, client: &Client) -> Result<String> {
     let mut listing = client
         .list_objects_v2()
         .bucket(opts.bucket.clone())
         .into_paginator()
         .send();
 
-    println!("key\tetag\tlast_modified\tstorage_class");
+    let mut output = String::new();
+    output += "key\tetag\tlast_modified\tstorage_class\n";
     while let Some(res) = listing.next().await {
         let object = res?;
         for item in object.contents() {
-            println!(
-                "{}\t{}\t{}\t{}",
+            output += &format!(
+                "{}\t{}\t{}\t{}\n",
                 item.key().unwrap_or_default(),
                 item.e_tag().unwrap_or_default(),
                 item.last_modified()
@@ -79,7 +83,7 @@ async fn list(opts: &Opts, client: &Client) -> Result<()> {
             );
         }
     }
-    Ok(())
+    Ok(output)
 }
 
 async fn get(opts: &Opts, client: &Client, key: &str) -> Result<Vec<u8>> {

test-programs/tests/aws_s3.rs

@@ -2,16 +2,22 @@ use anyhow::Result;
 use std::path::Path;
 use std::process::Command;
 
+fn run_s3_example() -> Command {
+    let mut command = Command::new("wasmtime");
+    command.arg("run");
+    command.arg("-Shttp");
+    command.args(["--env", "AWS_ACCESS_KEY_ID"]);
+    command.args(["--env", "AWS_SECRET_ACCESS_KEY"]);
+    command.args(["--env", "AWS_SESSION_TOKEN"]);
+    command.args(["--dir", ".::."]);
+    command.arg(test_programs::aws::S3);
+    command
+}
+
 #[test_log::test]
 fn aws_s3() -> Result<()> {
     // bucket list command
-    let output = Command::new("wasmtime")
-        .arg("run")
-        .arg("-Shttp")
-        .args(["--env", "AWS_ACCESS_KEY_ID"])
-        .args(["--env", "AWS_SECRET_ACCESS_KEY"])
-        .args(["--env", "AWS_SESSION_TOKEN"])
-        .arg(test_programs::aws::S3)
+    let output = run_s3_example()
         .arg(format!(
             "--region={}",
             std::env::var("AWS_REGION").unwrap_or_else(|_| "us-west-2".to_owned())
@@ -30,14 +36,7 @@ fn aws_s3() -> Result<()> {
     assert!(stdout.contains("shoug.jpg"));
 
     // bucket get command
-    let output = Command::new("wasmtime")
-        .arg("run")
-        .arg("-Shttp")
-        .args(["--env", "AWS_ACCESS_KEY_ID"])
-        .args(["--env", "AWS_SECRET_ACCESS_KEY"])
-        .args(["--env", "AWS_ACCESS_KEY_ID"])
-        .args(["--dir", ".::."])
-        .arg(test_programs::aws::S3)
+    let output = run_s3_example()
         .arg(format!(
             "--region={}",
             std::env::var("AWS_REGION").unwrap_or_else(|_| "us-west-2".to_owned())