use a NaiveDate in data model, it serializes to string (iso 8601 format)

5 files changed, 14 insertions, 12 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 3472190b..79b35191 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1340,6 +1340,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.3",
  "blake2",
+ "chrono",
  "err-derive",
  "futures",
  "futures-util",
diff --git a/Cargo.nix b/Cargo.nix
index d044c649..645985a8 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -33,7 +33,7 @@ args@{
   ignoreLockHash,
 }:
 let
-  nixifiedLockHash = "d4392b23d407f7ebc20d7f5db7583847e362665c1abb09f1c1d3305205e5996d";
+  nixifiedLockHash = "f5b86f9d75664ba528a26ae71f07a38e9c72c78fe331420b9b639e2a099d4dad";
   workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc;
   currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock);
   lockHashIgnored = if ignoreLockHash
@@ -981,7 +981,7 @@ in
       [ "iana-time-zone" ]
       [ "js-sys" ]
       [ "oldtime" ]
-      (lib.optional (rootFeatures' ? "garage/kubernetes-discovery" || rootFeatures' ? "garage_rpc/k8s-openapi" || rootFeatures' ? "garage_rpc/kube" || rootFeatures' ? "garage_rpc/kubernetes-discovery") "serde")
+      [ "serde" ]
       [ "std" ]
       [ "time" ]
       [ "wasm-bindgen" ]
@@ -993,7 +993,7 @@ in
       ${ if hostPlatform.isUnix then "iana_time_zone" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".iana-time-zone."0.1.57" { inherit profileName; }).out;
       ${ if hostPlatform.parsed.cpu.name == "wasm32" && !(hostPlatform.parsed.kernel.name == "emscripten" || hostPlatform.parsed.kernel.name == "wasi") then "js_sys" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".js-sys."0.3.64" { inherit profileName; }).out;
       num_traits = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".num-traits."0.2.16" { inherit profileName; }).out;
-      ${ if rootFeatures' ? "garage/kubernetes-discovery" || rootFeatures' ? "garage_rpc/k8s-openapi" || rootFeatures' ? "garage_rpc/kube" || rootFeatures' ? "garage_rpc/kubernetes-discovery" then "serde" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.188" { inherit profileName; }).out;
+      serde = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.188" { inherit profileName; }).out;
       time = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".time."0.1.45" { inherit profileName; }).out;
       ${ if hostPlatform.parsed.cpu.name == "wasm32" && !(hostPlatform.parsed.kernel.name == "emscripten" || hostPlatform.parsed.kernel.name == "wasi") then "wasm_bindgen" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".wasm-bindgen."0.2.87" { inherit profileName; }).out;
       ${ if hostPlatform.isWindows then "winapi" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".winapi."0.3.9" { inherit profileName; }).out;
@@ -1911,6 +1911,7 @@ in
       async_trait = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.73" { profileName = "__noProfile"; }).out;
       base64 = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".base64."0.21.3" { inherit profileName; }).out;
       blake2 = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".blake2."0.10.6" { inherit profileName; }).out;
+      chrono = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".chrono."0.4.26" { inherit profileName; }).out;
       err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out;
       futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.28" { inherit profileName; }).out;
diff --git a/src/api/s3/lifecycle.rs b/src/api/s3/lifecycle.rs
index 48265870..278cf26d 100644
--- a/src/api/s3/lifecycle.rs
+++ b/src/api/s3/lifecycle.rs
@@ -270,12 +270,11 @@ impl Expiration {
 			(Some(_), Some(_)) => Err("cannot have both <Days> and <Date> in <Expiration>"),
 			(None, None) => Err("<Expiration> must contain either <Days> or <Date>"),
 			(Some(days), None) => Ok(GarageLifecycleExpiration::AfterDays(days.0 as usize)),
-			(None, Some(date)) => {
-				if date.0.parse::<chrono::NaiveDate>().is_err() {
-					return Err("Invalid expiration <Date>");
-				}
-				Ok(GarageLifecycleExpiration::AtDate(date.0))
-			}
+			(None, Some(date)) => date
+				.0
+				.parse::<chrono::NaiveDate>()
+				.map(GarageLifecycleExpiration::AtDate)
+				.map_err(|_| "Invalid expiration <Date>"),
 		}
 	}
 
@@ -285,9 +284,9 @@ impl Expiration {
 				days: Some(IntValue(*days as i64)),
 				at_date: None,
 			},
-			GarageLifecycleExpiration::AtDate(days) => Expiration {
+			GarageLifecycleExpiration::AtDate(date) => Expiration {
 				days: None,
-				at_date: Some(Value::from(days.as_str())),
+				at_date: Some(Value(date.to_string())),
 			},
 		}
 	}
diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml
index 69f7eea4..58d9fdb7 100644
--- a/src/model/Cargo.toml
+++ b/src/model/Cargo.toml
@@ -23,6 +23,7 @@ garage_util.workspace = true
 async-trait = "0.1.7"
 arc-swap = "1.0"
 blake2 = "0.10"
+chrono = { version = "0.4", features = ["serde"] }
 err-derive = "0.3"
 hex = "0.4"
 base64 = "0.21"
diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index fed20e05..306a58ab 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -105,7 +105,7 @@ mod v08 {
 		/// Objects expire x days after they were created
 		AfterDays(usize),
 		/// Objects expire at date x (must be in yyyy-mm-dd format)
-		AtDate(String),
+		AtDate(chrono::naive::NaiveDate),
 	}
 
 	#[derive(Default, PartialEq, Eq, PartialOrd, Ord, Clone, Debug, Serialize, Deserialize)]