diff --git a/Cargo.lock b/Cargo.lock index 700a713..66d6a9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,6 +346,18 @@ dependencies = [ "event-listener", ] +[[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.0.2" @@ -556,9 +568,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" -version = "0.19.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ "funty", "radium", @@ -818,6 +830,22 @@ dependencies = [ "version_check", ] +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + [[package]] name = "cpuid-bool" version = "0.1.2" @@ -1108,19 +1136,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "env_logger" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.7.1" @@ -1187,7 +1202,7 @@ checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.5", + "redox_syscall", "winapi", ] @@ -1220,6 +1235,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.0.1" @@ -1555,6 +1585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "663563ebc56b0bac7e08722cca7742612fd99d9bd6d05cf904ed9d9212065a34" dependencies = [ "async-h1", + "async-native-tls", "async-std", "async-trait", "cfg-if 1.0.0", @@ -1929,6 +1960,24 @@ dependencies = [ "twoway", ] +[[package]] +name = "native-tls" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nb-connect" version = "1.0.3" @@ -2019,6 +2068,20 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "lazy_static", + "libc", + "openssl-sys", +] + [[package]] name = "openssl-probe" version = "0.1.2" @@ -2084,7 +2147,7 @@ dependencies = [ "async-std", "log", "otto-agent", - "pretty_env_logger 0.4.0", + "pretty_env_logger", "serde 1.0.123", "serde_json", "serde_yaml", @@ -2098,7 +2161,7 @@ dependencies = [ "config", "log", "otto-eventbus", - "pretty_env_logger 0.3.1", + "pretty_env_logger", "serde 1.0.123", "serde_json", ] @@ -2123,7 +2186,7 @@ dependencies = [ "os_pipe", "otto-agent", "otto-models", - "pretty_env_logger 0.4.0", + "pretty_env_logger", "serde 1.0.123", "serde_json", "tempfile", @@ -2147,7 +2210,7 @@ version = "0.1.0" dependencies = [ "async-std", "log", - "pretty_env_logger 0.4.0", + "pretty_env_logger", "tide", ] @@ -2171,7 +2234,7 @@ dependencies = [ "log", "otto-models", "otto-parser", - "pretty_env_logger 0.4.0", + "pretty_env_logger", "serde_json", "tide", "uuid", @@ -2189,7 +2252,7 @@ dependencies = [ "itertools", "log", "otto-models", - "pretty_env_logger 0.4.0", + "pretty_env_logger", "sqlx", "tide", "uuid", @@ -2221,7 +2284,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.5", + "redox_syscall", "smallvec", "winapi", ] @@ -2358,24 +2421,13 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -[[package]] -name = "pretty_env_logger" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" -dependencies = [ - "chrono", - "env_logger 0.6.2", - "log", -] - [[package]] name = "pretty_env_logger" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log", ] @@ -2511,12 +2563,6 @@ dependencies = [ "rand_core 0.6.2", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.5" @@ -2634,6 +2680,29 @@ dependencies = [ "untrusted", ] +[[package]] +name = "security-framework" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.9.0" @@ -3086,13 +3155,13 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "surf" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7189c787d96fe18fef704950de76d590022d9d70858a4a201e1f07a0666882ea" +checksum = "2a154d33ca6b5e1fe6fd1c760e5a5cc1202425f6cca2e13229f16a69009f6328" dependencies = [ "async-std", "async-trait", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "encoding_rs", "futures-util", "http-client", @@ -3100,7 +3169,7 @@ dependencies = [ "log", "mime_guess", "once_cell", - "pin-project-lite 0.1.12", + "pin-project-lite 0.2.5", "serde 1.0.123", "serde_json", "web-sys", @@ -3142,14 +3211,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall 0.1.57", + "rand 0.8.3", + "redox_syscall", "remove_dir_all", "winapi", ] diff --git a/cli/agent/Cargo.toml b/cli/agent/Cargo.toml index 4a18f8a..e4a83e4 100644 --- a/cli/agent/Cargo.toml +++ b/cli/agent/Cargo.toml @@ -10,10 +10,10 @@ path = "src/main.rs" [dependencies] async-std = { version = "1", features = ["attributes"]} -log = "~0.4.8" +log = "0.4" otto-agent= { path = "../../crates/agent" } -pretty_env_logger = "~0.4.0" -serde_json = "~1.0.59" +pretty_env_logger = "0.4" +serde_json = "1" # Needed for reading manifest yamls -serde_yaml = "~0.8.13" -serde = {version = "~1.0.117", features = ["rc", "derive"]} +serde_yaml = "0.8" +serde = {version = "1", features = ["rc", "derive"]} diff --git a/cli/osp/Cargo.toml b/cli/osp/Cargo.toml index 94505b0..a42ef7b 100644 --- a/cli/osp/Cargo.toml +++ b/cli/osp/Cargo.toml @@ -9,9 +9,9 @@ name = "osp" path = "src/main.rs" [dependencies] -flate2 = "~1.0.18" -gumdrop = "~0.8.0" +flate2 = "1" +gumdrop = "0.8" otto-models = { path = "../../crates/models" } -serde_yaml = "~0.8.13" -serde = {version = "~1.0.117", features = ["rc", "derive"]} -tar = "~0.4.30" +serde_yaml = "0.8" +serde = {version = "1", features = ["rc", "derive"]} +tar = "0.4" diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml index 6169fcb..ce6c429 100644 --- a/crates/agent/Cargo.toml +++ b/crates/agent/Cargo.toml @@ -6,14 +6,14 @@ edition = "2018" [dependencies] async-std = { version = "1", features = ["attributes"]} -log = "~0.4.8" -os_pipe = "~0.9.2" +log = "0.4" +os_pipe = "0.9" otto-models = { path = "../../crates/models" } -serde_json = "~1.0.59" +serde_json = "1" # Needed for reading manifest yamls -serde_yaml = "~0.8.13" -serde = {version = "~1.0.117", features = ["rc", "derive"]} -tempfile = "~3.1.0" +serde_yaml = "0.8" +serde = {version = "1", features = ["rc", "derive"]} +tempfile = "3" tide = "0.16" -url = "~2.2.0" -uuid = { version = "~0.8.1", features = ["v4", "serde"]} +url = "2" +uuid = { version = "0.8", features = ["v4", "serde"]} diff --git a/crates/models/Cargo.toml b/crates/models/Cargo.toml index 468196f..4bd960d 100644 --- a/crates/models/Cargo.toml +++ b/crates/models/Cargo.toml @@ -5,7 +5,7 @@ authors = ["R. Tyler Croy "] edition = "2018" [dependencies] -serde = {version = "~1.0.117", features = ["rc", "derive"]} -serde_json = "~1.0.59" -serde_yaml = "~0.8.17" -uuid = { version = "~0.8.1", features = ["v4", "serde"]} +serde = {version = "1", features = ["rc", "derive"]} +serde_json = "1" +serde_yaml = "0.8" +uuid = { version = "0.8", features = ["v4", "serde"]} diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml index 93527b8..2d1b0d0 100644 --- a/crates/parser/Cargo.toml +++ b/crates/parser/Cargo.toml @@ -5,9 +5,9 @@ authors = ["R. Tyler Croy "] edition = "2018" [dependencies] -log = "~0.4.11" +log = "0.4" otto-models = { path = "../models" } -pest = "~2.1.3" -pest_derive = "~2.1.0" -serde_json = "~1.0.59" -uuid = { version = "~0.8.1", features = ["v4", "serde"]} +pest = "2" +pest_derive = "2" +serde_json = "1" +uuid = { version = "0.8", features = ["v4", "serde"]} diff --git a/services/auctioneer/Cargo.toml b/services/auctioneer/Cargo.toml index 8ede90a..8ea085b 100644 --- a/services/auctioneer/Cargo.toml +++ b/services/auctioneer/Cargo.toml @@ -10,9 +10,9 @@ clap = { version = "~2.33.0", features = ["yaml"] } # Handling configuration overlays config = { version = "~0.10.1", features = ["yaml"] } # Logging -log = "~0.4.8" +log = "0.4" otto-eventbus = { path = "../eventbus" } -pretty_env_logger = "~0.3.1" +pretty_env_logger = "0.4" # Adding the "rc" feature so we can serialize/deserialize Arc and Rc -serde = { version = "~1.0.103", features = ["rc"] } -serde_json = "~1.0.0" +serde = { version = "1", features = ["rc"] } +serde_json = "1" diff --git a/services/eventbus/Cargo.toml b/services/eventbus/Cargo.toml index 2e2167b..a992754 100644 --- a/services/eventbus/Cargo.toml +++ b/services/eventbus/Cargo.toml @@ -5,10 +5,8 @@ authors = ["R. Tyler Croy "] edition = "2018" [dependencies] -log = "~0.4.8" -serde = { version = "~1.0.111", features = ["rc"] } -serde_derive = "~1.0.106" -serde_json = "~1.0.53" -uuid = { version = "~0.8.1", features = ["serde", "v4"] } - -[dev-dependencies] +log = "0.4" +serde = { version = "1", features = ["rc"] } +serde_derive = "1" +serde_json = "1" +uuid = { version = "0.8", features = ["serde", "v4"] } diff --git a/services/local-orchestrator/Cargo.toml b/services/local-orchestrator/Cargo.toml index b98297d..835daf7 100644 --- a/services/local-orchestrator/Cargo.toml +++ b/services/local-orchestrator/Cargo.toml @@ -6,13 +6,13 @@ edition = "2018" [dependencies] async-std = { version = "1", features = ["attributes"]} -log = "~0.4.11" -os_pipe = "~0.9.2" +log = "0.4" +os_pipe = "0.9" otto-agent = { path = "../../crates/agent" } otto-models = { path = "../../crates/models" } -pretty_env_logger = "~0.4.0" -serde = {version = "~1.0.117", features = ["rc", "derive"]} -serde_json = "~1.0.59" -tempfile = "~3.1.0" +pretty_env_logger = "0.4" +serde = {version = "1", features = ["rc", "derive"]} +serde_json = "1" +tempfile = "3" tide = "0.16" -uuid = { version = "~0.8.1", features = ["v4", "serde"]} +uuid = { version = "0.8", features = ["v4", "serde"]} diff --git a/services/object-store/Cargo.toml b/services/object-store/Cargo.toml index 248bf72..4ac70d3 100644 --- a/services/object-store/Cargo.toml +++ b/services/object-store/Cargo.toml @@ -14,6 +14,6 @@ path = "src/main.rs" [dependencies] async-std = { version = "1", features = ["attributes"]} -log = "~0.4.11" -pretty_env_logger = "~0.4.0" +log = "0.4" +pretty_env_logger = "0.4" tide = "0.16" diff --git a/services/parser/Cargo.toml b/services/parser/Cargo.toml index d0a5bf7..2f2fac0 100644 --- a/services/parser/Cargo.toml +++ b/services/parser/Cargo.toml @@ -10,10 +10,10 @@ path = "src/main.rs" [dependencies] async-std = { version = "1", features = ["attributes"]} -log = "~0.4.11" +log = "0.4" otto-models = { path = "../../crates/models" } otto-parser = { path = "../../crates/parser" } -pretty_env_logger = "~0.4.0" -serde_json = "~1.0.59" +pretty_env_logger = "0.4" +serde_json = "1" tide = "0.16" -uuid = { version = "~0.8.1", features = ["v4", "serde"]} +uuid = { version = "0.8", features = ["v4", "serde"]} diff --git a/services/reldata/Cargo.toml b/services/reldata/Cargo.toml index 5b49c03..17bbde2 100644 --- a/services/reldata/Cargo.toml +++ b/services/reldata/Cargo.toml @@ -11,9 +11,9 @@ async-trait = "0.1" async-std = { version = "1", features = ["attributes"]} dotenv = "0.15" itertools = "0.10" -log = "~0.4.11" +log = "0.4" otto-models = { path = "../../crates/models" } -pretty_env_logger = "~0.4.0" -sqlx = { version = "~0.5.1", features = ["runtime-async-std-rustls", "postgres", "tls", "json", "sqlite", "chrono", "macros", "uuid"]} +pretty_env_logger = "0.4" +sqlx = { version = "0.5", features = ["runtime-async-std-rustls", "postgres", "tls", "json", "sqlite", "chrono", "macros", "uuid"]} tide = "0.16" uuid = { version = "0.8", features = ["serde", "v4"]} diff --git a/stdlib/archive/Cargo.toml b/stdlib/archive/Cargo.toml index 6109255..6ba3b8d 100644 --- a/stdlib/archive/Cargo.toml +++ b/stdlib/archive/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" [dependencies] async-std = { version = "1", features = ["attributes"] } -flate2 = "~1.0.18" -glob = "~0.3.0" +flate2 = "1" +glob = "0.3" otto-agent = { path = "../../crates/agent" } -serde = {version = "~1.0.117", features = ["derive"]} +serde = {version = "1", features = ["derive"]} # Not using the curl-client default feature to ensure that builds won't require # libcurl for now -surf = { version = "~2.1.0", features = ["h1-client"]} -tar = "~0.4.30" +surf = { version = "2", features = ["h1-client"]} +tar = "0.4" diff --git a/stdlib/dir/Cargo.toml b/stdlib/dir/Cargo.toml index 1880584..88c60c6 100644 --- a/stdlib/dir/Cargo.toml +++ b/stdlib/dir/Cargo.toml @@ -5,7 +5,7 @@ authors = ["R. Tyler Croy "] edition = "2018" [dependencies] -serde_yaml = "~0.8.13" -serde = {version = "~1.0.117", features = ["derive"]} +serde_yaml = "0.8" +serde = {version = "1", features = ["derive"]} otto-agent = { path = "../../crates/agent" } otto-models = { path = "../../crates/models" } diff --git a/stdlib/error/Cargo.toml b/stdlib/error/Cargo.toml index 8eb7ff1..08555da 100644 --- a/stdlib/error/Cargo.toml +++ b/stdlib/error/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] otto-agent = { path = "../../crates/agent" } -serde = {version = "~1.0.117", features = ["derive"]} +serde = {version = "1", features = ["derive"]} diff --git a/stdlib/git/Cargo.toml b/stdlib/git/Cargo.toml index 37bc936..1084f66 100644 --- a/stdlib/git/Cargo.toml +++ b/stdlib/git/Cargo.toml @@ -5,9 +5,9 @@ authors = ["R. Tyler Croy "] edition = "2018" [dependencies] -git2 = "~0.13.12" +git2 = "0.13" otto-agent = { path = "../../crates/agent" } -serde = {version = "~1.0.117", features = ["derive"]} -url = "~2.2.0" +serde = {version = "1", features = ["derive"]} +url = "2" # Used for managing the cached reference directories -sha2 = "~0.9.2" +sha2 = "0.9" diff --git a/stdlib/sh/Cargo.toml b/stdlib/sh/Cargo.toml index f57c0e6..99abbfa 100644 --- a/stdlib/sh/Cargo.toml +++ b/stdlib/sh/Cargo.toml @@ -5,7 +5,7 @@ authors = ["R. Tyler Croy "] edition = "2018" [dependencies] -os_pipe = "~0.9.2" +os_pipe = "0.9" otto-agent = { path = "../../crates/agent" } -serde = {version = "~1.0.117", features = ["derive"]} -tempfile = "~3.1.0" +serde = {version = "1", features = ["derive"]} +tempfile = "3" diff --git a/stdlib/unarchive/Cargo.toml b/stdlib/unarchive/Cargo.toml index 35c58ce..3b3cceb 100644 --- a/stdlib/unarchive/Cargo.toml +++ b/stdlib/unarchive/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" [dependencies] async-std = { version = "1", features = ["attributes"] } otto-agent = { path = "../../crates/agent" } -serde = {version = "~1.0.117", features = ["derive"]} -surf = { version = "~2.1.0", features = ["h1-client"]} +serde = {version = "1", features = ["derive"]} +surf = { version = "2", features = ["h1-client"]}