diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-08-25 11:19:38 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-08-25 11:27:46 +0200 |
| commit | f3589fee774b1eb90609e6a01551b4c096589d70 (patch) | |
| tree | ad56b4b33dcbab557f9b2b13da0b1929a73b9474 /src | |
| parent | 8d62616ec057c8a9e32e9ae42ca637369ee403e3 (diff) | |
| download | garage-f3589fee774b1eb90609e6a01551b4c096589d70.tar.gz garage-f3589fee774b1eb90609e6a01551b4c096589d70.zip | |
update Cargo dependenciesupdate-dependencies-1.1
Some aws-* crates have been pinned because newer versions don't compile
with rustc 1.73. These crates are only used for integration testing, no
crates which are part of the final Garage version are concerned.
Diffstat (limited to 'src')
| -rw-r--r-- | src/garage/Cargo.toml | 3 | ||||
| -rw-r--r-- | src/model/s3/lifecycle_worker.rs | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index 9cc71abd..a1778355 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -63,7 +63,10 @@ syslog-tracing = { workspace = true, optional = true } [dev-dependencies] aws-config.workspace = true +aws-types.workspace = true +aws-credential-types.workspace = true aws-sdk-s3.workspace = true + chrono.workspace = true http.workspace = true hmac.workspace = true diff --git a/src/model/s3/lifecycle_worker.rs b/src/model/s3/lifecycle_worker.rs index 9ecf168c..0dcb248d 100644 --- a/src/model/s3/lifecycle_worker.rs +++ b/src/model/s3/lifecycle_worker.rs @@ -388,13 +388,14 @@ fn check_size_filter(version_data: &ObjectVersionData, filter: &LifecycleFilter) fn midnight_ts(date: NaiveDate) -> u64 { date.and_hms_opt(0, 0, 0) .expect("midnight does not exist") + .and_utc() .timestamp_millis() as u64 } fn next_date(ts: u64) -> NaiveDate { - NaiveDateTime::from_timestamp_millis(ts as i64) + DateTime::from_timestamp_millis(ts as i64) .expect("bad timestamp") - .date() + .date_naive() .succ_opt() .expect("no next day") } |