remove use of ATTY

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

.pipelines/DSC-Official.yml

@@ -21,6 +21,7 @@ variables:
 #  LinuxContainerImage: 'mcr.microsoft.com/onebranch/cbl-mariner/build:2.0'
   LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
   WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+  Codeql.TSAEnabled: true
 
 resources:
   repositories:

dsc/Cargo.lock

@@ -11,7 +11,6 @@ opt-level = 2
 lto = true
 
 [dependencies]
-atty = { version = "0.2" }
 clap = { version = "4.5.17", features = ["derive"] }
 clap_complete = { version = "4.5.28" }
 crossterm = { version = "0.28.1" }

dsc/Cargo.toml

@@ -2,10 +2,9 @@
 // Licensed under the MIT License.
 
 use args::{Args, SubCommand};
-use atty::Stream;
 use clap::{CommandFactory, Parser};
 use clap_complete::generate;
-use std::io::{self, Read};
+use std::io::{self, IsTerminal, Read};
 use std::process::exit;
 use sysinfo::{Process, RefreshKind, System, get_current_pid, ProcessRefreshKind};
 use tracing::{error, info, warn, debug};
@@ -39,7 +38,7 @@ fn main() {
 
     debug!("Running dsc {}", env!("CARGO_PKG_VERSION"));
 
-    let input = if atty::is(Stream::Stdin) {
+    let input = if io::stdin().is_terminal() {
         None
     } else {
         info!("Reading input from STDIN");

dsc/src/main.rs

@@ -4,7 +4,6 @@
 use crate::args::{ConfigSubCommand, DscType, OutputFormat, ResourceSubCommand};
 use crate::resolve::{get_contents, Include};
 use crate::resource_command::{get_resource, self};
-use crate::Stream;
 use crate::tablewriter::Table;
 use crate::util::{DSC_CONFIG_ROOT, EXIT_DSC_ERROR, EXIT_INVALID_INPUT, EXIT_JSON_ERROR, get_schema, write_output, get_input, set_dscconfigroot, validate_json};
 use dsc_lib::configure::{Configurator, config_doc::{Configuration, ExecutionKind}, config_result::ResourceGetResult};
@@ -17,6 +16,7 @@ use dsc_lib::{
     dscresources::resource_manifest::{import_manifest, ResourceManifest},
 };
 use std::collections::HashMap;
+use std::io::{self, IsTerminal};
 use std::process::exit;
 use tracing::{debug, error, trace};
 
@@ -498,7 +498,7 @@ pub fn resource(subcommand: &ResourceSubCommand, stdin: &Option<String>) {
 fn list_resources(dsc: &mut DscManager, resource_name: &Option<String>, adapter_name: &Option<String>, description: &Option<String>, tags: &Option<Vec<String>>, format: &Option<OutputFormat>) {
     let mut write_table = false;
     let mut table = Table::new(&["Type", "Kind", "Version", "Caps", "RequireAdapter", "Description"]);
-    if format.is_none() && atty::is(Stream::Stdout) {
+    if format.is_none() && io::stdin().is_terminal() {
         // write as table if format is not specified and interactive
         write_table = true;
     }
@@ -580,7 +580,7 @@ fn list_resources(dsc: &mut DscManager, resource_name: &Option<String>, adapter_
             };
             write_output(&json, format);
             // insert newline separating instances if writing to console
-            if atty::is(Stream::Stdout) { println!(); }
+            if io::stdin().is_terminal() { println!(); }
         }
     }
 

dsc/src/subcommand.rs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 use crate::args::{DscType, OutputFormat, TraceFormat};
-use atty::Stream;
 use crate::resolve::Include;
 use dsc_lib::{
     configure::{
@@ -31,6 +30,7 @@ use schemars::{schema_for, schema::RootSchema};
 use serde_json::Value;
 use std::collections::HashMap;
 use std::env;
+use std::io::IsTerminal;
 use std::path::Path;
 use std::process::exit;
 use syntect::{
@@ -194,7 +194,7 @@ pub fn write_output(json: &str, format: &Option<OutputFormat>) {
     let mut is_json = true;
     let mut output_format = format.clone();
     let mut syntax_color = false;
-    if atty::is(Stream::Stdout) {
+    if std::io::stdin().is_terminal() {
         syntax_color = true;
         if output_format.is_none() {
             output_format = Some(OutputFormat::Yaml);

dsc/src/util.rs

@@ -6,7 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-atty = { version = "0.2.0" }
 clap = { version = "4.4.0", features = ["derive"] }
 serde = { version = "1.0.0", features = ["derive"] }
 serde_json = { version = "1.0.0", features = ["preserve_order"] }

runcommandonset/Cargo.lock

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use atty::Stream;
 use clap::Parser;
-use std::{io::{self, Read}, process::exit};
+use std::{io::{self, Read, IsTerminal}, process::exit};
 use tracing::{error, warn, debug};
 
 use args::{Arguments, SubCommand, TraceLevel};
@@ -41,7 +40,7 @@ fn main() {
     enable_tracing(&trace_level, &args.trace_format);
     warn!("This resource is not idempotent");
 
-    let stdin = if atty::is(Stream::Stdin) {
+    let stdin = if std::io::stdin().is_terminal() {
         None
     } else {
         debug!("Reading input from STDIN");

runcommandonset/Cargo.toml

@@ -23,4 +23,4 @@ path = "bindings/rust/lib.rs"
 tree-sitter = "0.24.3"
 
 [build-dependencies]
-cc = "1.1.20"
+cc = "1.1"