git.delta.rocks / jrsonnet / refs/commits / 80667c474dc7

288		created_at,288		created_at,
289		expires_at,289		expires_at,
290		parts,290		parts,
291		// TODO: Fill with expected
292		generation_data: serde_json::Value::Null,
291	})293	})
292}294}
293async fn generate(295async fn generate(
507							created_at: Utc::now(),509							created_at: Utc::now(),
508							expires_at,510							expires_at,
509							parts,511							parts,
512							generation_data: serde_json::Value::Null,
510						},513						},
511					},514					},
512				);515				);
534						created_at: Utc::now(),537						created_at: Utc::now(),
535						expires_at: None,538						expires_at: None,
536						parts: BTreeMap::new(),539						parts: BTreeMap::new(),
540						generation_data: serde_json::Value::Null,
537					}541					}
538				};542				};
539543

--- a/crates/fleet-base/src/fleetdata.rs
+++ b/crates/fleet-base/src/fleetdata.rs
@@ -117,4 +117,8 @@
 
 	#[serde(flatten)]
 	pub parts: BTreeMap<String, FleetSecretPart>,
+
+	#[serde(default)]
+	#[serde(skip_serializing_if = "Value::is_null")]
+	pub generation_data: Value,
 }

--- a/crates/nix-eval/src/macros.rs
+++ b/crates/nix-eval/src/macros.rs
@@ -7,7 +7,7 @@
 	pub(crate) out: String,
 	used_fields: Vec<Value>,
 }
-trait AttrSetValue {
+pub trait AttrSetValue {
 	fn to_builder(self) -> NixExprBuilder;
 }
 trait Primitive {}

--- a/modules/nixos/secrets.nix
+++ b/modules/nixos/secrets.nix
@@ -41,6 +41,17 @@
           type = str;
           description = "Secret public data (only available for plaintext)";
         };
+
+        expectedGenerationData = mkOption {
+          type = unspecified;
+          description = "Data that gets embedded into secret part";
+          default = null;
+        };
+        generationData = mkOption {
+          type = unspecified;
+          description = "Data that is embedded into secret part";
+          default = null;
+        };
       };
       config = {
         hash = hashString "sha1" config.raw;