sch-UID2-5339 salt rotation populate previous salt #460
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tation-previous-salt
…tation-previous-salt
aulme
approved these changes
May 9, 2025
| assertEquals("salt1", result.getSnapshot().getAllRotatingSalts()[0].previousSalt()); | ||
| assertEquals("salt2", result.getSnapshot().getAllRotatingSalts()[1].previousSalt()); | ||
| assertEquals("salt3", result.getSnapshot().getAllRotatingSalts()[2].previousSalt()); | ||
| assertEquals(7, Arrays.stream(result.getSnapshot().getAllRotatingSalts()).filter(s -> s.previousSalt() == null).count()); |
Contributor
There was a problem hiding this comment.
As I understand, this is the "preserve old value of previousSalt for not rotated salts"? I suggest we move that into a separate test and use a mix of salts with previousSalt null and previousSalt not null.
Contributor
Author
There was a problem hiding this comment.
This one is just checking that we haven't populated the previous salt for salts that haven't rotated, not necessarily preserving the old value.
|
|
||
| final SaltRotation.Result result = saltRotation.rotateSalts(lastSnapshot, minAges, 0.5, targetDate); | ||
| assertTrue(result.hasSnapshot()); | ||
| assertEquals(2, Arrays.stream(result.getSnapshot().getAllRotatingSalts()).filter(s -> "lessThan90DaysOld".equals(s.previousSalt())).count()); |
Contributor
There was a problem hiding this comment.
Maybe better to just assert on what's the previous salts are at each position like you did in the previous test? This will be a bit more complicated to figure out if this test fails.
| final long over90Days = daysEarlier(100).toEpochMilli(); | ||
| final RotatingSaltProvider.SaltSnapshot lastSnapshot = SnapshotBuilder.start() | ||
| .withEntries( | ||
| new SaltEntry(1, "1", lessThan90Days, "currentSalt", null, "lessThan90DaysOld", null, null), |
Contributor
There was a problem hiding this comment.
Why double up all the test cases?
aulme
approved these changes
May 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unit tests:
rotateSaltsPopulatePreviousSaltOnRotation()
- when a salt is rotated, populate the previous salt field with the current salt
rotateSaltsPreservePreviousSaltsLessThan90DaysOld()
- salts that are under 90 days old and are not being rotated will keep their previous salt
rotateSaltsRemovePreviousSaltsOver90DaysOld()
- salts that are equal to or over 90 days old and are not being rotated will have their previous salts removed