Support bundle can output to console (Azure#2563)

This gives support bundle the ability to output to stdout instead of a file. This will be used to collect the bundle from a direct method. Allowing console output removes the need to write the bundle to disk
aavaav · Feb 21, 2020 · 91fd4fd · 91fd4fd
1 parent 1c04102
commit 91fd4fd
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 70 deletions.
diff --git a/edgelet/iotedge/src/lib.rs b/edgelet/iotedge/src/lib.rs
@@ -30,7 +30,7 @@ pub use crate::error::{Error, ErrorKind, FetchLatestVersionsReason};
 pub use crate::list::List;
 pub use crate::logs::Logs;
 pub use crate::restart::Restart;
-pub use crate::support_bundle::SupportBundle;
+pub use crate::support_bundle::{OutputLocation, SupportBundle};
 pub use crate::unknown::Unknown;
 pub use crate::version::Version;
 

diff --git a/edgelet/iotedge/src/logs.rs b/edgelet/iotedge/src/logs.rs
@@ -47,7 +47,7 @@ pub fn pull_logs<M, W>(
 ) -> impl Future<Item = W, Error = Error> + Send
 where
     M: 'static + ModuleRuntime,
-    W: 'static + Write + Send,
+    W: Write + Send,
 {
     runtime
         .logs(id, options)

diff --git a/edgelet/iotedge/src/main.rs b/edgelet/iotedge/src/main.rs
@@ -242,7 +242,7 @@ fn run() -> Result<(), Error> {
                 .about("Bundles troubleshooting information")
                 .arg(
                     Arg::with_name("output")
-                        .help("Path of output file")
+                        .help("Location to output file. Use - for stdout")
                         .long("output")
                         .short("o")
                         .takes_value(true)
@@ -271,7 +271,7 @@ fn run() -> Result<(), Error> {
                         .takes_value(true),
                 ).arg(
                     Arg::with_name("quiet")
-                        .help("Suppress output")
+                        .help("Suppress status output")
                         .long("quiet")
                         .short("q")
                         .takes_value(false),
@@ -384,13 +384,19 @@ fn run() -> Result<(), Error> {
             let include_ms_only = args.is_present("include-edge-runtime-only");
             let verbose = !args.is_present("quiet");
             let iothub_hostname = args.value_of("iothub-hostname").map(ToOwned::to_owned);
+            let output_location = if location == "-" {
+                OutputLocation::Console
+            } else {
+                OutputLocation::File(location.to_owned())
+            };
+
             tokio_runtime.block_on(
                 SupportBundle::new(
                     options,
-                    location.to_owned(),
                     include_ms_only,
                     verbose,
                     iothub_hostname,
+                    output_location,
                     runtime()?,
                 )
                 .execute(),