git.delta.rocks / jrsonnet / refs/commits / 426fcb53be1a

difftreelog

fix generation data assertion for not regenerated secrets

Lach2025-04-27parent: #51e9901.patch.diff
in: trunk

1 file changed

modifiedmodules/secrets-data.nixdiffbeforeafterboth
131 ||131 ||
132 sort (a: b: a < b) (config.data.sharedSecrets.${name} or { owners = [ ]; }).owners132 sort (a: b: a < b) (config.data.sharedSecrets.${name} or { owners = [ ]; }).owners
133 == sort (a: b: a < b) secret.expectedOwners;133 == sort (a: b: a < b) secret.expectedOwners;
134 message = "Shared secret ${name} is expected to be encrypted for ${toJSON secret.expectedOwners}, but it is encrypted for ${134 message = "Shared secret ${name} is expected to be encrypted for ${toJSON secret.expectedOwners}, but it is encrypted for ${
135 toJSON config.data.sharedSecrets.${name}.owners135 toJSON (config.data.sharedSecrets.${name} or { owners = [ ]; }).owners
136 }. Run fleet secrets regenerate to fix";136 }. Run fleet secrets regenerate to fix";
137 }) config.sharedSecrets)137 }) config.sharedSecrets)
138 ++ (mapAttrsToList (name: secret: {138 ++ (mapAttrsToList (name: secret: {
139 # TODO: Same aassertion should be in host secrets139 # TODO: Same aassertion should be in host secrets
140 assertion = config.data.sharedSecrets.${name}.generationData == secret.expectedGenerationData;140 assertion =
141 (config.data.sharedSecrets.${name} or { generationData = null; }).generationData
142 == secret.expectedGenerationData;
141 message = "Shared secret ${name} has unexpected generation data ${toJSON secret.expectedGenerationData} != ${143 message = "Shared secret ${name} has unexpected generation data ${toJSON secret.expectedGenerationData} != ${
142 toJSON config.data.sharedSecrets.${name}.expectedGenerationData144 toJSON (config.data.sharedSecrets.${name} or { generationData = null; }).generationData
143 }. Run fleet secrets regenerate to fix";145 }. Run fleet secrets regenerate to fix";
144 }) config.sharedSecrets);146 }) config.sharedSecrets);
145 sharedSecrets = mapAttrs (_: _: { }) config.data.sharedSecrets;147 sharedSecrets = mapAttrs (_: _: { }) config.data.sharedSecrets;
146 };148 };