Rename rotatable to refreshable salts

Author: aulme

src/main/java/com/uid2/admin/salt/SaltRotation.java

@@ -41,22 +41,22 @@ public Result rotateSalts(
         }
 
         // Salts that can be rotated based on their refreshFrom being at target date
-        var rotatableSalts = findRotatableSalts(preRotationSalts, targetDate);
+        var refreshableSalts = findRefreshableSalts(preRotationSalts, targetDate);
 
         var saltsToRotate = pickSaltsToRotate(
-                rotatableSalts,
+                refreshableSalts,
                 targetDate,
                 minAges,
                 getNumSaltsToRotate(preRotationSalts, fraction)
         );
 
         if (saltsToRotate.isEmpty()) {
-            return Result.noSnapshot("all rotatable salts are below min rotation age");
+            return Result.noSnapshot("all refreshable salts are below min rotation age");
         }
 
         var postRotationSalts = rotateSalts(preRotationSalts, saltsToRotate, targetDate);
 
-        logSaltAges("rotatable-salts", targetDate, rotatableSalts);
+        logSaltAges("refreshable-salts", targetDate, refreshableSalts);
         logSaltAges("rotated-salts", targetDate, saltsToRotate);
         logSaltAges("total-salts", targetDate, Arrays.asList(postRotationSalts));
 
@@ -72,11 +72,11 @@ private static int getNumSaltsToRotate(SaltEntry[] preRotationSalts, double frac
         return (int) Math.ceil(preRotationSalts.length * fraction);
     }
 
-    private Set<SaltEntry> findRotatableSalts(SaltEntry[] preRotationSalts, TargetDate targetDate) {
-        return Arrays.stream(preRotationSalts).filter(s -> isRotatable(targetDate, s)).collect(Collectors.toSet());
+    private Set<SaltEntry> findRefreshableSalts(SaltEntry[] preRotationSalts, TargetDate targetDate) {
+        return Arrays.stream(preRotationSalts).filter(s -> isRefreshable(targetDate, s)).collect(Collectors.toSet());
     }
 
-    private boolean isRotatable(TargetDate targetDate, SaltEntry salt) {
+    private boolean isRefreshable(TargetDate targetDate, SaltEntry salt) {
         if (this.isRefreshFromEnabled) {
             return salt.refreshFrom().equals(targetDate.asEpochMs());
         }
@@ -129,7 +129,7 @@ private String calculatePreviousSalt(SaltEntry salt, boolean shouldRotate, Targe
     }
 
     private List<SaltEntry> pickSaltsToRotate(
-            Set<SaltEntry> rotatableSalts,
+            Set<SaltEntry> refreshableSalts,
             TargetDate targetDate,
             Duration[] minAges,
             int numSaltsToRotate
@@ -146,7 +146,7 @@ private List<SaltEntry> pickSaltsToRotate(
 
             var maxIndexes = numSaltsToRotate - indexesToRotate.size();
             var saltsToRotate = pickSaltsToRotateInTimeWindow(
-                    rotatableSalts,
+                    refreshableSalts,
                     maxIndexes,
                     minLastUpdated.toEpochMilli(),
                     maxLastUpdated.toEpochMilli()
@@ -158,12 +158,12 @@ private List<SaltEntry> pickSaltsToRotate(
     }
 
     private List<SaltEntry> pickSaltsToRotateInTimeWindow(
-            Set<SaltEntry> rotatableSalts,
+            Set<SaltEntry> refreshableSalts,
             int maxIndexes,
             long minLastUpdated,
             long maxLastUpdated
     ) {
-        ArrayList<SaltEntry> candidateSalts = rotatableSalts.stream()
+        ArrayList<SaltEntry> candidateSalts = refreshableSalts.stream()
                 .filter(salt -> minLastUpdated <= salt.lastUpdated() && salt.lastUpdated() < maxLastUpdated)
                 .collect(Collectors.toCollection(ArrayList::new));
 

src/test/java/com/uid2/admin/salt/SaltRotationTest.java

@@ -355,12 +355,12 @@ void logsSaltAgesOnRotation() throws Exception {
 
         var lastSnapshot = SaltSnapshotBuilder.start()
                 .entries(
-                        // 5 salts total, 3 rotatable, 2 rotated given 40% fraction
-                        SaltBuilder.start().lastUpdated(daysEarlier(65)).refreshFrom(targetDate()), // Rotatable, old enough, rotated
-                        SaltBuilder.start().lastUpdated(daysEarlier(5)).refreshFrom(targetDate()), // Rotatable, too new
-                        SaltBuilder.start().lastUpdated(daysEarlier(50)).refreshFrom(daysLater(1)), // Not rotatable, old enough
-                        SaltBuilder.start().lastUpdated(daysEarlier(65)).refreshFrom(targetDate()), // Rotatable, old enough, rotated
-                        SaltBuilder.start().lastUpdated(daysEarlier(10)).refreshFrom(daysLater(10)) // Not rotatable, too new
+                        // 5 salts total, 3 refreshable, 2 rotated given 40% fraction
+                        SaltBuilder.start().lastUpdated(daysEarlier(65)).refreshFrom(targetDate()), // Refreshable, old enough, rotated
+                        SaltBuilder.start().lastUpdated(daysEarlier(5)).refreshFrom(targetDate()), // Refreshable, too new
+                        SaltBuilder.start().lastUpdated(daysEarlier(50)).refreshFrom(daysLater(1)), // Not refreshable, old enough
+                        SaltBuilder.start().lastUpdated(daysEarlier(65)).refreshFrom(targetDate()), // Refreshable, old enough, rotated
+                        SaltBuilder.start().lastUpdated(daysEarlier(10)).refreshFrom(daysLater(10)) // Not refreshable, too new
                 )
                 .build();
 
@@ -371,9 +371,9 @@ void logsSaltAgesOnRotation() throws Exception {
                 "[INFO] salt-count-type=total-salts target-date=2025-01-01 age=10 salt-count=1",
                 "[INFO] salt-count-type=total-salts target-date=2025-01-01 age=50 salt-count=1",
 
-                // Pre-rotation ages, we want to see at which ages salts become rotatable, post rotation some will be 0
-                "[INFO] salt-count-type=rotatable-salts target-date=2025-01-01 age=5 salt-count=1",
-                "[INFO] salt-count-type=rotatable-salts target-date=2025-01-01 age=65 salt-count=2",
+                // Pre-rotation ages, we want to see at which ages salts become refreshable, post rotation some will be 0
+                "[INFO] salt-count-type=refreshable-salts target-date=2025-01-01 age=5 salt-count=1",
+                "[INFO] salt-count-type=refreshable-salts target-date=2025-01-01 age=65 salt-count=2",
 
                 // Pre-rotation ages, post rotation they will all have age 0
                 "[INFO] salt-count-type=rotated-salts target-date=2025-01-01 age=65 salt-count=2"