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

difftreelog

feat generation data

Yaroslav Bolyukin2024-11-30parent: #6d807f6.patch.diff
in: trunk

4 files changed

modifiedcmds/fleet/src/cmds/secrets/mod.rsdiffbeforeafterboth
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
modifiedcrates/fleet-base/src/fleetdata.rsdiffbeforeafterboth
118 #[serde(flatten)]118 #[serde(flatten)]
119 pub parts: BTreeMap<String, FleetSecretPart>,119 pub parts: BTreeMap<String, FleetSecretPart>,
120
121 #[serde(default)]
122 #[serde(skip_serializing_if = "Value::is_null")]
123 pub generation_data: Value,
120}124}
121125
modifiedcrates/nix-eval/src/macros.rsdiffbeforeafterboth
7 pub(crate) out: String,7 pub(crate) out: String,
8 used_fields: Vec<Value>,8 used_fields: Vec<Value>,
9}9}
10trait AttrSetValue {10pub trait AttrSetValue {
11 fn to_builder(self) -> NixExprBuilder;11 fn to_builder(self) -> NixExprBuilder;
12}12}
13trait Primitive {}13trait Primitive {}
modifiedmodules/nixos/secrets.nixdiffbeforeafterboth
42 description = "Secret public data (only available for plaintext)";42 description = "Secret public data (only available for plaintext)";
43 };43 };
44
45 expectedGenerationData = mkOption {
46 type = unspecified;
47 description = "Data that gets embedded into secret part";
48 default = null;
49 };
50 generationData = mkOption {
51 type = unspecified;
52 description = "Data that is embedded into secret part";
53 default = null;
54 };
44 };55 };
45 config = {56 config = {
46 hash = hashString "sha1" config.raw;57 hash = hashString "sha1" config.raw;