diff --git a/Cargo.lock b/Cargo.lock index b4cafed..a5f1eb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,6 +322,18 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-native-tls" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" +dependencies = [ + "async-std", + "native-tls", + "thiserror", + "url", +] + [[package]] name = "async-process" version = "1.8.1" @@ -402,19 +414,6 @@ version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" -[[package]] -name = "async-tls" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52" -dependencies = [ - "futures-core", - "futures-io", - "rustls", - "webpki", - "webpki-roots", -] - [[package]] name = "async-trait" version = "0.1.77" @@ -468,12 +467,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.1" @@ -558,9 +551,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cacache" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490" +checksum = "a61ff12b19d89c752c213316b87fdb4a587f073d219b893cc56974b8c9f39bf7" dependencies = [ "async-std", "digest 0.10.7", @@ -799,6 +792,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -1140,6 +1143,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1476,9 +1494,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1487,9 +1505,9 @@ dependencies = [ [[package]] name = "http-cache" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5ab65432bbdfe8490dfde21d0366353a8d39f2bc24aca0146889f931b0b4b5" +checksum = "d6ffb12b95bb2a369fe47ca8924016c72c2fa0e6059ba98bd1516f558696c5a8" dependencies = [ "async-trait", "bincode", @@ -1504,9 +1522,9 @@ dependencies = [ [[package]] name = "http-cache-semantics" -version = "1.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aec9f678bca3f4a15194b980f20ed9bfe0dd38e8d298c65c559a93dfbd6380a" +checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ "http", "http-serde", @@ -1516,9 +1534,9 @@ dependencies = [ [[package]] name = "http-cache-surf" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d299aea9375d69133b6a76c1fc61ed4ce7ff66ce05e4537bfd3c33855d5316b" +checksum = "34734ae7741171faf3cf704304cd72e2fa5484498917fdf2fa06e422bf441bb8" dependencies = [ "anyhow", "async-trait", @@ -1539,8 +1557,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" dependencies = [ "async-h1", + "async-native-tls", "async-std", - "async-tls", "async-trait", "cfg-if", "dashmap", @@ -1548,14 +1566,13 @@ dependencies = [ "futures", "http-types", "log", - "rustls", ] [[package]] name = "http-serde" -version = "1.1.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +checksum = "1133cafcce27ea69d35e56b3a8772e265633e04de73c5f4e1afdffc1d19b5419" dependencies = [ "http", "serde", @@ -1970,6 +1987,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "no-std-compat" version = "0.4.1" @@ -2049,6 +2084,32 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -2510,21 +2571,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - [[package]] name = "ron" version = "0.8.1" @@ -2589,19 +2635,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -2623,6 +2656,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -2630,13 +2672,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.6.1" +name = "security-framework" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ - "ring", - "untrusted", + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] @@ -2845,12 +2900,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spinning_top" version = "0.3.0" @@ -3012,6 +3061,7 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7" dependencies = [ + "async-native-tls", "async-std", "async-trait", "cfg-if", @@ -3024,7 +3074,6 @@ dependencies = [ "mime_guess", "once_cell", "pin-project-lite", - "rustls", "serde", "serde_json", "web-sys", @@ -3204,7 +3253,7 @@ dependencies = [ [[package]] name = "tfc-toolset-extras" -version = "0.2.3" +version = "0.2.4" dependencies = [ "anyhow", "config 0.14.0", @@ -3265,7 +3314,7 @@ dependencies = [ [[package]] name = "tfct" -version = "0.4.0" +version = "0.4.1" dependencies = [ "anyhow", "async-scoped", @@ -3533,12 +3582,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" version = "2.5.0" @@ -3688,25 +3731,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" -dependencies = [ - "webpki", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/examples/tfc-clean-workspace/Cargo.toml b/examples/tfc-clean-workspace/Cargo.toml index 66ac84b..c3cb825 100644 --- a/examples/tfc-clean-workspace/Cargo.toml +++ b/examples/tfc-clean-workspace/Cargo.toml @@ -32,7 +32,7 @@ log = "0.4.21" miette = { version = "7.1.0", features = ["fancy"] } serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" -surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] } +surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client"] } thiserror = "1.0.57" url = "2.5.0" walkdir = "2.5.0" diff --git a/examples/tfc-run-workspace/Cargo.toml b/examples/tfc-run-workspace/Cargo.toml index 2863eaf..43bb0ca 100644 --- a/examples/tfc-run-workspace/Cargo.toml +++ b/examples/tfc-run-workspace/Cargo.toml @@ -28,7 +28,7 @@ log = "0.4.21" miette = { version = "7.1.0", features = ["fancy"] } serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" -surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] } +surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client"] } thiserror = "1.0.57" url = "2.5.0" diff --git a/examples/tfc-variable-set/Cargo.toml b/examples/tfc-variable-set/Cargo.toml index bc985bd..1e10856 100644 --- a/examples/tfc-variable-set/Cargo.toml +++ b/examples/tfc-variable-set/Cargo.toml @@ -28,7 +28,7 @@ log = "0.4.21" miette = { version = "7.1.0", features = ["fancy"] } serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" -surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] } +surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client"] } thiserror = "1.0.57" url = "2.5.0" diff --git a/examples/tfc-which-workspace/Cargo.toml b/examples/tfc-which-workspace/Cargo.toml index 36ab0db..17592ce 100644 --- a/examples/tfc-which-workspace/Cargo.toml +++ b/examples/tfc-which-workspace/Cargo.toml @@ -27,7 +27,7 @@ log = "0.4.21" miette = { version = "7.1.0", features = ["fancy"] } serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" -surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] } +surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client"] } thiserror = "1.0.57" url = "2.5.0" diff --git a/tfc-toolset-extras/Cargo.toml b/tfc-toolset-extras/Cargo.toml index e11d1d4..0b4b6e5 100644 --- a/tfc-toolset-extras/Cargo.toml +++ b/tfc-toolset-extras/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tfc-toolset-extras" -version = "0.2.3" +version = "0.2.4" description = "Extra stuff for tfc-toolset you may or may not want to use" authors = ["Christian Haynes <06chaynes@gmail.com>"] repository = "https://github.com/06chaynes/tfc-toolset.git" @@ -14,12 +14,12 @@ rust-version = "1.71.1" anyhow = "1.0.80" config = "0.14.0" dirs = "5.0.1" -http-cache-surf = "0.12.1" +http-cache-surf = "0.13.0" log = "0.4.21" regex = "1.10.3" serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" -surf = { version = "2.3.2", default-features = false, features = ["h1-client-rustls"] } +surf = { version = "2.3.2", default-features = false, features = ["h1-client"] } surf-governor = "0.2.0" surf-retry = "0.3.2" thiserror = "1.0.57" diff --git a/tfct/Cargo.toml b/tfct/Cargo.toml index d699706..a985826 100644 --- a/tfct/Cargo.toml +++ b/tfct/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tfct" -version = "0.4.0" +version = "0.4.1" description = "A tool to help manage a toolset that helps manage your deployments" authors = ["Christian Haynes <06chaynes@gmail.com>"] repository = "https://github.com/06chaynes/tfc-toolset.git" @@ -37,7 +37,7 @@ log = "0.4.21" miette = { version = "7.1.0", features = ["fancy"] } serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" -surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] } +surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client"] } thiserror = "1.0.57" time = { version = "0.3.34", features = ["serde", "parsing", "formatting", "serde-well-known"] } url = "2.5.0" @@ -49,4 +49,4 @@ version = "0.6.0" [dependencies.tfc-toolset-extras] path = "../tfc-toolset-extras" -version = "0.2.3" +version = "0.2.4"