Merge pull request #4 from joonas/fix/GHSA-g98v-hv3f-hcfr

fix: Address GHSA-g98v-hv3f-hcfr
wasmCloud · Mar 29, 2024 · ca3527b · ca3527b
2 parents 00adb86 + 1726808
commit ca3527b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,6 @@ async-nats = {workspace = true}
 axum = {workspace = true}
 axum-server = {workspace = true}
 anyhow = {workspace = true}
-atty = {workspace = true}
 ctrlc = {workspace = true}
 futures = {workspace = true}
 handlebars = {workspace = true}
@@ -57,7 +56,6 @@ async-nats = "0.33"
 axum = { version = "0.6", features = ["headers"] }
 axum-server = { version = "0.4", features = ["tls-rustls"] }
 anyhow = "1"
-atty = "0.2"
 ctrlc = "3"
 futures = "0.3"
 handlebars = "5.1"

diff --git a/src/main.rs b/src/main.rs
@@ -16,6 +16,7 @@ use opentelemetry::sdk::{
     trace::{self, RandomIdGenerator, Sampler},
     Resource as OTELResource,
 };
+use std::io::IsTerminal;
 use std::net::SocketAddr;
 use std::time::Duration;
 use tracing::{error, info};
@@ -87,7 +88,7 @@ fn configure_tracing(enabled: bool) -> anyhow::Result<()> {
     let env_filter_layer = tracing_subscriber::EnvFilter::from_default_env();
     let log_layer = tracing_subscriber::fmt::layer()
         .with_writer(std::io::stderr)
-        .with_ansi(atty::is(atty::Stream::Stderr));
+        .with_ansi(std::io::stderr().is_terminal());
 
     let otel_layer = tracing_opentelemetry::layer().with_tracer(tracer);