git.delta.rocks / jrsonnet / refs/commits / bbcec9f6c831

difftreelog

refactor expected owners consistent naming

Yaroslav Bolyukin2024-11-30parent: #80667c4.patch.diff
in: trunk

1 file changed

modifiedcmds/fleet/src/cmds/secrets/mod.rsdiffbeforeafterboth
136 config: &Config,136 config: &Config,
137 mut secret: FleetSharedSecret,137 mut secret: FleetSharedSecret,
138 field: Value,138 field: Value,
139 updated_set: &[String],139 expected_owners: &[String],
140 prefer_identities: &[String],140 prefer_identities: &[String],
141 batch: Option<NixBuildBatch>,141 batch: Option<NixBuildBatch>,
142) -> Result<FleetSharedSecret> {142) -> Result<FleetSharedSecret> {
143 let original_set = secret.owners.clone();143 let original_set = secret.owners.clone();
144144
145 let set = original_set.iter().collect::<BTreeSet<_>>();145 let set = original_set.iter().collect::<BTreeSet<_>>();
146 let expected_set = updated_set.iter().collect::<BTreeSet<_>>();146 let expected_set = expected_owners.iter().collect::<BTreeSet<_>>();
147147
148 if set == expected_set {148 if set == expected_set {
149 info!("no need to update owner list, it is already correct");149 info!("no need to update owner list, it is already correct");
163 if should_regenerate {163 if should_regenerate {
164 info!("secret is owner-dependent, will regenerate");164 info!("secret is owner-dependent, will regenerate");
165 let generated =165 let generated =
166 generate_shared(config, secret_name, field, updated_set.to_vec(), batch).await?;166 generate_shared(config, secret_name, field, expected_owners.to_vec(), batch).await?;
167 Ok(generated)167 Ok(generated)
168 } else {168 } else {
169 drop(batch);169 drop(batch);
185 }185 }
186 let host = config.host(identity_holder).await?;186 let host = config.host(identity_holder).await?;
187 let encrypted = host187 let encrypted = host
188 .reencrypt(part.raw.clone(), updated_set.to_vec())188 .reencrypt(part.raw.clone(), expected_owners.to_vec())
189 .await?;189 .await?;
190 part.raw = encrypted;190 part.raw = encrypted;
191 }191 }
192192
193 secret.owners = updated_set.to_vec();193 secret.owners = expected_owners.to_vec();
194 Ok(secret)194 Ok(secret)
195 }195 }
196}196}