Merge pull request #120 from dandi/gh-17

Support all documented S3 Inventory fields in inventory lists
dandi · Jan 9, 2025 · 466babc · 466babc
2 parents 94b972f + b407852
commit 466babc
Show file tree

Hide file tree

Showing 11 changed files with 537 additions and 194 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 In Development
 --------------
 - Add `--compress-filter-msgs` option
+- Support all documented S3 Inventory fields in inventory lists
 
 v0.1.0-alpha.2 (2025-01-06)
 ---------------------------

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,9 +35,10 @@ percent-encoding = "2.3.1"
 regex = "1.11.1"
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.134"
+strum = { version = "0.26.3", features = ["derive"] }
 tempfile = "3.15.0"
 thiserror = "2.0.9"
-time = { version = "0.3.37", features = ["macros", "parsing", "serde"] }
+time = { version = "0.3.37", features = ["macros", "parsing"] }
 tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread", "signal"] }
 tokio-util = { version = "0.7.13", features = ["rt"] }
 tracing = "0.1.41"

diff --git a/README.md b/README.md
@@ -13,18 +13,8 @@ making use of the bucket's [Amazon S3 Inventory][inv] files.
 [inv]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-inventory.html
 
 Currently, only versioned buckets and S3 Inventories with CSV output files are
-supported, and the CSVs are required to have exactly the following fields, in
-order:
-
-- `Bucket`
-- `Key`
-- `VersionId`
-- `IsLatest`
-- `IsDeleteMarker`
-- `Size`
-- `LastModifiedDate`
-- `ETag`
-- `IsMultipartUploaded`
+supported, and the CSVs are required to list at least the `Bucket`, `Key`,
+`VersionId`, and `ETag` fields.
 
 **Warning:** This is an in-development program.  They may be bugs, and some
 planned features have not been implemented yet.