buck2: stdin: take console opts when creating interactive stream

Summary: To allow disabling this if needed.

Reviewed By: IanChilds

Differential Revision: D39810490

fbshipit-source-id: f0138fd0f76eded825c644b87e45cef3b83a9a3c

buck2_audit/src/lib.rs

@@ -143,7 +143,7 @@ impl StreamingCommand for AuditCommand {
                     context: Some(context),
                     serialized_opts: serialized,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(self.console_opts()),
             )
             .await??;
         ExitResult::success()

buck2_client/src/commands/aquery.rs

@@ -79,7 +79,7 @@ impl StreamingCommand for AqueryCommand {
                     output_attributes,
                     unstable_output_format,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await??;
 

buck2_client/src/commands/build.rs

@@ -245,7 +245,7 @@ impl StreamingCommand for BuildCommand {
                     build_opts: Some(self.build_opts.to_proto()),
                     final_artifact_materializations: self.materializations.to_proto() as i32,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await;
         let success = match &result {

buck2_client/src/commands/bxl.rs

@@ -72,7 +72,7 @@ impl StreamingCommand for BxlCommand {
                     build_opts: Some(self.build_opts.to_proto()),
                     final_artifact_materializations: self.materializations.to_proto() as i32,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await;
         let success = match &result {

buck2_client/src/commands/cquery.rs

@@ -128,7 +128,7 @@ impl StreamingCommand for CqueryCommand {
                     target_call_stacks: self.query_common.target_call_stacks,
                     correct_owner,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await??;
 

buck2_client/src/commands/debug/materialize.rs

@@ -60,7 +60,7 @@ impl StreamingCommand for MaterializeCommand {
                     context: Some(context),
                     paths: self.paths,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await??;
 

buck2_client/src/commands/install.rs

@@ -68,7 +68,7 @@ impl StreamingCommand for InstallCommand {
                     build_opts: Some(self.build_opts.to_proto()),
                     installer_run_args: self.extra_run_args,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await;
         let console = self.console_opts.final_console();

buck2_client/src/commands/profile.rs

@@ -166,7 +166,8 @@ impl StreamingCommand for ProfileSubcommand {
                     action: self.action.into(),
                     recursive: self.opts.recursive,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin()
+                    .console_interaction_stream(&self.opts.console_opts),
             )
             .await??;
         let ProfileResponse {

buck2_client/src/commands/run.rs

@@ -112,7 +112,7 @@ impl StreamingCommand for RunCommand {
                     build_opts: Some(self.build_opts.to_proto()),
                     final_artifact_materializations: Materializations::Materialize as i32,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await;
 

buck2_client/src/commands/targets.rs

@@ -225,18 +225,19 @@ impl StreamingCommand for TargetsCommand {
         };
 
         if self.show_output {
-            targets_show_outputs(ctx.stdin(), buckd, target_request, None).await
+            targets_show_outputs(ctx.stdin(), buckd, target_request, None, &self.console_opts).await
         } else if self.show_full_output {
             let project_root = ctx.paths()?.roots.project_root.clone();
             targets_show_outputs(
                 ctx.stdin(),
                 buckd,
                 target_request,
                 Some(project_root.root()),
+                &self.console_opts,
             )
             .await
         } else {
-            targets(ctx.stdin(), buckd, target_request).await
+            targets(ctx.stdin(), buckd, target_request, &self.console_opts).await
         }
     }
 
@@ -258,10 +259,14 @@ async fn targets_show_outputs(
     mut buckd: BuckdClientConnector,
     target_request: TargetsRequest,
     root_path: Option<&AbsPath>,
+    console_opts: &CommonConsoleOptions,
 ) -> ExitResult {
     let response = buckd
         .with_flushing()
-        .targets_show_outputs(target_request, stdin.console_interaction_stream())
+        .targets_show_outputs(
+            target_request,
+            stdin.console_interaction_stream(console_opts),
+        )
         .await??;
     for target_paths in response.targets_paths {
         for path in target_paths.paths {
@@ -289,10 +294,14 @@ async fn targets(
     stdin: &mut Stdin,
     mut buckd: BuckdClientConnector,
     target_request: TargetsRequest,
+    console_opts: &CommonConsoleOptions,
 ) -> ExitResult {
     let response = buckd
         .with_flushing()
-        .targets(target_request, stdin.console_interaction_stream())
+        .targets(
+            target_request,
+            stdin.console_interaction_stream(console_opts),
+        )
         .await??;
     if !response.serialized_targets_output.is_empty() {
         crate::print!("{}", response.serialized_targets_output)?;

buck2_client/src/commands/test.rs

@@ -162,7 +162,7 @@ impl StreamingCommand for TestCommand {
                         force_run_from_project_root: self.unstable_force_tests_on_re,
                     }),
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await??;
 

buck2_client/src/commands/uquery.rs

@@ -227,7 +227,7 @@ impl StreamingCommand for UqueryCommand {
                     unstable_output_format,
                     target_call_stacks: self.query_common.target_call_stacks,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await??;
 

buck2_client/src/stdin.rs

@@ -20,6 +20,7 @@ use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 use tokio_util::io::StreamReader;
 
+use crate::common::CommonConsoleOptions;
 use crate::console_interaction_stream::ConsoleInteractionStream;
 
 #[pin_project]
@@ -99,7 +100,10 @@ impl Stdin {
         )
     }
 
-    pub fn console_interaction_stream(&mut self) -> Option<ConsoleInteractionStream<'_>> {
+    pub fn console_interaction_stream(
+        &mut self,
+        _opts: &CommonConsoleOptions,
+    ) -> Option<ConsoleInteractionStream<'_>> {
         ConsoleInteractionStream::new(self)
     }
 }

cli/src/commands/docs/starlark.rs

@@ -89,7 +89,7 @@ impl StreamingCommand for DocsStarlarkCommand {
                     retrieve_builtins: self.builtins,
                     retrieve_prelude: self.prelude,
                 },
-                ctx.stdin().console_interaction_stream(),
+                ctx.stdin().console_interaction_stream(&self.console_opts),
             )
             .await??;