diff --git a/services/backup/Cargo.lock b/services/backup/Cargo.lock --- a/services/backup/Cargo.lock +++ b/services/backup/Cargo.lock @@ -220,7 +220,7 @@ "serde_urlencoded", "smallvec", "socket2 0.4.9", - "time 0.3.27", + "time", "url", ] @@ -444,7 +444,7 @@ "http", "hyper", "ring", - "time 0.3.27", + "time", "tokio", "tower", "tracing", @@ -630,7 +630,7 @@ "percent-encoding", "regex", "sha2", - "time 0.3.27", + "time", "tracing", ] @@ -737,7 +737,7 @@ "itoa", "num-integer", "ryu", - "time 0.3.27", + "time", ] [[package]] @@ -966,17 +966,16 @@ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -1076,7 +1075,7 @@ checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.27", + "time", "version_check", ] @@ -1399,7 +1398,7 @@ dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1795,7 +1794,7 @@ dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -2603,17 +2602,6 @@ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.27" @@ -3030,12 +3018,6 @@ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/services/backup/Cargo.toml b/services/backup/Cargo.toml --- a/services/backup/Cargo.toml +++ b/services/backup/Cargo.toml @@ -12,7 +12,7 @@ aws-config = "0.55" aws-sdk-dynamodb = "0.27" aws-types = "0.55" -chrono = "0.4" +chrono = "0.4.31" clap = { version = "4.0", features = ["derive", "env"] } comm-lib = { path = "../../shared/comm-lib", features = [ "http", diff --git a/services/blob/Cargo.lock b/services/blob/Cargo.lock --- a/services/blob/Cargo.lock +++ b/services/blob/Cargo.lock @@ -220,7 +220,7 @@ "serde_urlencoded", "smallvec", "socket2 0.4.7", - "time 0.3.17", + "time", "url", ] @@ -313,6 +313,12 @@ "alloc-no-stdlib", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -390,7 +396,7 @@ "http", "hyper", "ring", - "time 0.3.17", + "time", "tokio", "tower", "tracing", @@ -612,7 +618,7 @@ "percent-encoding", "regex", "sha2", - "time 0.3.17", + "time", "tracing", ] @@ -752,7 +758,7 @@ "itoa", "num-integer", "ryu", - "time 0.3.17", + "time", ] [[package]] @@ -1019,17 +1025,16 @@ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.44", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] @@ -1127,7 +1132,7 @@ checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.17", + "time", "version_check", ] @@ -1481,7 +1486,7 @@ dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1922,7 +1927,7 @@ dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -2685,17 +2690,6 @@ "once_cell", ] -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.17" @@ -3138,12 +3132,6 @@ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/services/blob/Cargo.toml b/services/blob/Cargo.toml --- a/services/blob/Cargo.toml +++ b/services/blob/Cargo.toml @@ -14,7 +14,7 @@ aws-config = "0.55" aws-sdk-dynamodb = "0.27" aws-sdk-s3 = "0.27" -chrono = "0.4" +chrono = "0.4.31" clap = { version = "4.0", features = ["derive", "env"] } comm-lib = { path = "../../shared/comm-lib", features = ["http"] } derive_more = "0.99" diff --git a/services/commtest/Cargo.lock b/services/commtest/Cargo.lock --- a/services/commtest/Cargo.lock +++ b/services/commtest/Cargo.lock @@ -120,7 +120,7 @@ "http", "hyper", "ring", - "time 0.3.28", + "time", "tokio", "tower", "tracing", @@ -306,7 +306,7 @@ "percent-encoding", "regex", "sha2", - "time 0.3.28", + "time", "tracing", ] @@ -413,7 +413,7 @@ "itoa", "num-integer", "ryu", - "time 0.3.28", + "time", ] [[package]] @@ -616,15 +616,14 @@ [[package]] name = "chrono" -version = "0.4.27" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", "windows-targets", ] @@ -1041,7 +1040,7 @@ dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1407,7 +1406,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -2216,17 +2215,6 @@ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.28" @@ -2729,12 +2717,6 @@ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/services/identity/Cargo.lock b/services/identity/Cargo.lock --- a/services/identity/Cargo.lock +++ b/services/identity/Cargo.lock @@ -11,6 +11,12 @@ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -175,7 +181,7 @@ "http", "hyper", "ring", - "time 0.3.20", + "time", "tokio", "tower", "tracing", @@ -333,7 +339,7 @@ "percent-encoding", "regex", "sha2 0.10.6", - "time 0.3.20", + "time", "tracing", ] @@ -439,7 +445,7 @@ "itoa", "num-integer", "ryu", - "time 0.3.20", + "time", ] [[package]] @@ -659,17 +665,16 @@ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] @@ -2675,17 +2680,6 @@ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.20" @@ -3117,12 +3111,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/services/identity/Cargo.toml b/services/identity/Cargo.toml --- a/services/identity/Cargo.toml +++ b/services/identity/Cargo.toml @@ -15,7 +15,7 @@ aws-sdk-dynamodb = "0.24.0" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -chrono = "0.4.19" +chrono = "0.4.31" rand = "0.8" constant_time_eq = "0.2.2" siwe = "0.3" @@ -24,11 +24,11 @@ once_cell = "1.17" hex = "0.4" tonic-web = "0.9.1" -serde = { version = "1.0.159", features = [ "derive" ] } +serde = { version = "1.0.159", features = ["derive"] } serde_json = "1.0.95" tunnelbroker_messages = { path = "../../shared/tunnelbroker_messages" } moka = { version = "0.10", features = ["future"] } -uuid = { version = "1.3", features = [ "v4" ] } +uuid = { version = "1.3", features = ["v4"] } base64 = "0.21.2" regex = "1" tower-http = { version = "0.4", features = ["cors"] } diff --git a/services/reports/Cargo.lock b/services/reports/Cargo.lock --- a/services/reports/Cargo.lock +++ b/services/reports/Cargo.lock @@ -218,7 +218,7 @@ "serde_urlencoded", "smallvec", "socket2 0.5.3", - "time 0.3.28", + "time", "url", ] @@ -467,7 +467,7 @@ "http", "hyper", "ring", - "time 0.3.28", + "time", "tokio", "tower", "tracing", @@ -653,7 +653,7 @@ "percent-encoding", "regex", "sha2", - "time 0.3.28", + "time", "tracing", ] @@ -760,7 +760,7 @@ "itoa", "num-integer", "ryu", - "time 0.3.28", + "time", ] [[package]] @@ -961,18 +961,17 @@ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -1084,7 +1083,7 @@ checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.28", + "time", "version_check", ] @@ -1389,7 +1388,7 @@ dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1835,7 +1834,7 @@ dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -2776,17 +2775,6 @@ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.28" @@ -3212,12 +3200,6 @@ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/services/reports/Cargo.toml b/services/reports/Cargo.toml --- a/services/reports/Cargo.toml +++ b/services/reports/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0" aws-config = "0.55" aws-sdk-dynamodb = "0.27" -chrono = { version = "0.4", features = ["serde"] } +chrono = { version = "0.4.31", features = ["serde"] } clap = { version = "4.0", features = ["derive", "env"] } comm-lib = { path = "../../shared/comm-lib", features = [ "blob-client", diff --git a/services/reports/src/service.rs b/services/reports/src/service.rs --- a/services/reports/src/service.rs +++ b/services/reports/src/service.rs @@ -7,12 +7,7 @@ database, }; use derive_more::{Display, Error, From}; -use std::{ - collections::HashMap, - future::{ready, Future}, - pin::Pin, - sync::Arc, -}; +use std::{collections::HashMap, future::Future, pin::Pin, sync::Arc}; use tracing::{error, trace, warn}; use crate::{ diff --git a/shared/comm-lib/Cargo.lock b/shared/comm-lib/Cargo.lock --- a/shared/comm-lib/Cargo.lock +++ b/shared/comm-lib/Cargo.lock @@ -220,7 +220,7 @@ "serde_urlencoded", "smallvec", "socket2 0.4.7", - "time 0.3.20", + "time", "url", ] @@ -349,6 +349,12 @@ "alloc-no-stdlib", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -426,7 +432,7 @@ "http", "hyper", "ring", - "time 0.3.20", + "time", "tokio", "tower", "tracing", @@ -612,7 +618,7 @@ "percent-encoding", "regex", "sha2", - "time 0.3.20", + "time", "tracing", ] @@ -719,7 +725,7 @@ "itoa", "num-integer", "ryu", - "time 0.3.20", + "time", ] [[package]] @@ -919,17 +925,16 @@ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.1", ] [[package]] @@ -1004,7 +1009,7 @@ checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.20", + "time", "version_check", ] @@ -1341,7 +1346,7 @@ dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1795,7 +1800,7 @@ dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.45.0", ] @@ -2632,17 +2637,6 @@ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.20" @@ -3035,12 +3029,6 @@ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/shared/comm-lib/Cargo.toml b/shared/comm-lib/Cargo.toml --- a/shared/comm-lib/Cargo.toml +++ b/shared/comm-lib/Cargo.toml @@ -31,7 +31,7 @@ aws-sdk-secretsmanager = "0.27" aws-types = "0.55" base64 = "0.21" -chrono = "0.4" +chrono = "0.4.31" constant_time_eq = "0.3" derive_more = "0.99" grpc_clients = { path = "../grpc_clients" } diff --git a/shared/comm-lib/src/auth/service.rs b/shared/comm-lib/src/auth/service.rs --- a/shared/comm-lib/src/auth/service.rs +++ b/shared/comm-lib/src/auth/service.rs @@ -132,7 +132,7 @@ .last_rotated_date() .and_then(|date| date.to_millis().ok()) .and_then(NaiveDateTime::from_timestamp_millis) - .map(|naive| DateTime::::from_utc(naive, Utc)) + .map(|naive| DateTime::::from_naive_utc_and_offset(naive, Utc)) .map(|last_rotated| Utc::now().signed_duration_since(last_rotated)); Ok(duration) } diff --git a/shared/comm-lib/src/database.rs b/shared/comm-lib/src/database.rs --- a/shared/comm-lib/src/database.rs +++ b/shared/comm-lib/src/database.rs @@ -385,7 +385,7 @@ DBItemAttributeError::TimestampOutOfRange, ) })?; - Ok(DateTime::from_utc(naive_datetime, Utc)) + Ok(DateTime::from_naive_utc_and_offset(naive_datetime, Utc)) } pub fn parse_integer(