diff --git a/Cargo.lock b/Cargo.lock index a1add0b4e..a3f79950e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,8 +264,8 @@ checksum = "0b0e103ce36d217d568903ad27b14ec2238ecb5d65bad2e756a8f3c0d651506e" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes", - "windows-sys", + "io-lifetimes 0.7.3", + "windows-sys 0.36.1", ] [[package]] @@ -277,12 +277,12 @@ dependencies = [ "ambient-authority", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 0.7.3", "ipnet", "maybe-owned", - "rustix", + "rustix 0.35.11", "winapi-util", - "windows-sys", + "windows-sys 0.36.1", "winx", ] @@ -304,9 +304,9 @@ checksum = "c9d6e70b626eceac9d6fc790fe2d72cc3f2f7bc3c35f467690c54a526b0f56db" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes", + "io-lifetimes 0.7.3", "ipnet", - "rustix", + "rustix 0.35.11", ] [[package]] @@ -317,7 +317,7 @@ checksum = "c3a0524f7c4cff2ea547ae2b652bf7a348fd3e48f76556dc928d8b45ab2f1d50" dependencies = [ "cap-primitives", "once_cell", - "rustix", + "rustix 0.35.11", "winx", ] @@ -1190,7 +1190,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -1239,9 +1239,9 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a267b6a9304912e018610d53fe07115d8b530b160e85db4d2d3a59f3ddde1aec" dependencies = [ - "io-lifetimes", - "rustix", - "windows-sys", + "io-lifetimes 0.7.3", + "rustix 0.35.11", + "windows-sys 0.36.1", ] [[package]] @@ -1716,8 +1716,8 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5d8c2ab5becd8720e30fd25f8fa5500d8dc3fceadd8378f05859bd7b46fc49" dependencies = [ - "io-lifetimes", - "windows-sys", + "io-lifetimes 0.7.3", + "windows-sys 0.36.1", ] [[package]] @@ -1727,7 +1727,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.36.1", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys 0.42.0", ] [[package]] @@ -1743,9 +1753,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d508111813f9af3afd2f92758f77e4ed2cc9371b642112c6a48d22eb73105c5" dependencies = [ "hermit-abi 0.2.6", - "io-lifetimes", - "rustix", - "windows-sys", + "io-lifetimes 0.7.3", + "rustix 0.35.11", + "windows-sys 0.36.1", +] + +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes 1.0.3", + "rustix 0.36.5", + "windows-sys 0.42.0", ] [[package]] @@ -1887,6 +1909,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" + [[package]] name = "liquid" version = "0.23.1" @@ -2018,7 +2046,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" dependencies = [ - "rustix", + "rustix 0.35.11", ] [[package]] @@ -2064,7 +2092,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -2381,7 +2409,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -2983,12 +3011,26 @@ checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.3", "itoa 1.0.4", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.46", "once_cell", - "windows-sys", + "windows-sys 0.36.1", +] + +[[package]] +name = "rustix" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.3", + "libc", + "linux-raw-sys 0.1.3", + "windows-sys 0.42.0", ] [[package]] @@ -3059,7 +3101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -3425,7 +3467,6 @@ version = "0.6.0" dependencies = [ "anyhow", "async-trait", - "atty", "bindle", "bytes", "cargo-target-dep", @@ -3443,6 +3484,7 @@ dependencies = [ "hippo", "hippo-openapi", "hyper", + "is-terminal 0.4.1", "lazy_static", "nix 0.24.2", "openssl", @@ -3839,9 +3881,9 @@ dependencies = [ "bitflags", "cap-fs-ext", "cap-std", - "io-lifetimes", - "rustix", - "windows-sys", + "io-lifetimes 0.7.3", + "rustix 0.35.11", + "windows-sys 0.36.1", "winx", ] @@ -4426,14 +4468,14 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes", - "is-terminal", + "io-lifetimes 0.7.3", + "is-terminal 0.3.0", "once_cell", - "rustix", + "rustix 0.35.11", "system-interface", "tracing", "wasi-common", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4447,12 +4489,12 @@ dependencies = [ "cap-rand", "cap-std", "io-extras", - "rustix", + "rustix 0.35.11", "thiserror", "tracing", "wasmtime", "wiggle", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4464,8 +4506,8 @@ dependencies = [ "anyhow", "cap-std", "io-extras", - "io-lifetimes", - "rustix", + "io-lifetimes 0.7.3", + "rustix 0.35.11", "tokio", "wasi-cap-std-sync", "wasi-common", @@ -4584,7 +4626,7 @@ dependencies = [ "wasmtime-jit", "wasmtime-runtime", "wat", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4608,11 +4650,11 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.35.11", "serde", "sha2 0.10.6", "toml", - "windows-sys", + "windows-sys 0.36.1", "zstd", ] @@ -4664,9 +4706,9 @@ checksum = "edf27540165d5fd3af99cb04a05b8ccc8d04bbdf380d2fd87fd5cb3f1093c08c" dependencies = [ "cc", "cfg-if", - "rustix", + "rustix 0.35.11", "wasmtime-asm-macros", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4692,7 +4734,7 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4703,7 +4745,7 @@ checksum = "ad4511b8abbdbaf3e9aaa4044ead8bd31b70e2da5e43e2cb91605f871ca23d56" dependencies = [ "object", "once_cell", - "rustix", + "rustix 0.35.11", ] [[package]] @@ -4714,7 +4756,7 @@ checksum = "6fb7b3e58024d8d395dfc4efbe2a58360a1998565b118b0342b3cf62a4084bde" dependencies = [ "cfg-if", "libc", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4734,13 +4776,13 @@ dependencies = [ "memoffset", "paste", "rand 0.8.5", - "rustix", + "rustix 0.35.11", "thiserror", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4918,43 +4960,100 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.10.1" @@ -4971,8 +5070,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7b01e010390eb263a4518c8cebf86cb67469d1511c00b749a47b64c39e8054d" dependencies = [ "bitflags", - "io-lifetimes", - "windows-sys", + "io-lifetimes 0.7.3", + "windows-sys 0.36.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 35561812e..886c1b2b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,6 @@ edition = "2021" [dependencies] anyhow = "1.0" async-trait = "0.1" -atty = "0.2" bindle = { workspace = true } bytes = "1.1" chrono = "0.4" @@ -30,6 +29,7 @@ env_logger = "0.9" futures = "0.3" hippo-openapi = "0.10" hippo = { git = "https://github.com/deislabs/hippo-cli", tag = "v0.16.1" } +is-terminal = "0.4" lazy_static = "1.4.0" nix = { version = "0.24", features = ["signal"] } outbound-http = { path = "crates/outbound-http" } diff --git a/src/bin/spin.rs b/src/bin/spin.rs index 7a32a607b..78801a396 100644 --- a/src/bin/spin.rs +++ b/src/bin/spin.rs @@ -1,5 +1,6 @@ use anyhow::Error; use clap::{CommandFactory, Parser, Subcommand}; +use is_terminal::IsTerminal; use lazy_static::lazy_static; use spin_cli::commands::{ bindle::BindleCommands, @@ -21,7 +22,7 @@ async fn main() -> Result<(), Error> { tracing_subscriber::fmt() .with_writer(std::io::stderr) .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .with_ansi(atty::is(atty::Stream::Stderr)) + .with_ansi(std::io::stderr().is_terminal()) .init(); SpinApp::parse().run().await }