Prevent unnecessary RBAC users request (#567)

RedHatInsights · Sep 8, 2021 · 7953ed1 · 7953ed1
1 parent f27e4bd
commit 7953ed1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.../main/java/com/redhat/cloud/notifications/recipients/rbac/RbacRecipientUsersProvider.java b/.../main/java/com/redhat/cloud/notifications/recipients/rbac/RbacRecipientUsersProvider.java
@@ -119,7 +119,7 @@ private Uni<List<User>> getWithPagination(Function<Integer, Uni<Page<RbacUser>>>
                     AtomicInteger::new,
                     state -> fetcher.apply(state.getAndIncrement())
                 )
-                .until(page -> page.getData().isEmpty())
+                .whilst(page -> page.getData().size() == rbacElementsPerPage)
                 .onItem().transform(page -> page.getData().stream().map(rbacUser -> {
                     User user = new User();
                     user.setUsername(rbacUser.getUsername());

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -120,8 +120,8 @@ quarkus.log.cloudwatch.access-key-secret=placeholder
 
 # The current status is cached to limit the number of status DB queries
 quarkus.cache.caffeine.maintenance.expire-after-write=PT60s
-quarkus.cache.caffeine.rbac-recipient-users-provider-get-users.expire-after-write=PT5M
-quarkus.cache.caffeine.rbac-recipient-users-provider-get-group-users.expire-after-write=PT5M
+quarkus.cache.caffeine.rbac-recipient-users-provider-get-users.expire-after-write=PT10M
+quarkus.cache.caffeine.rbac-recipient-users-provider-get-group-users.expire-after-write=PT10M
 
 # Period between two event log cleanings. It must be expressed with the ISO-8601 duration format PnDTnHnMn.nS.
 event-log-cleaner.period=PT10M
diff --git a/...t/java/com/redhat/cloud/notifications/recipients/rbac/RbacRecipientUsersProviderTest.java b/...t/java/com/redhat/cloud/notifications/recipients/rbac/RbacRecipientUsersProviderTest.java
@@ -55,7 +55,7 @@ public void getAllUsersFromDefaultGroup() {
 
     @Test
     public void getAllUsersCache() {
-        int initialSize = 95;
+        int initialSize = 1095;
         mockGetUsers(initialSize, false);
 
         List<User> users = rbacRecipientUsersProvider.getUsers(accountId, false).await().indefinitely();
@@ -65,7 +65,7 @@ public void getAllUsersCache() {
             Assertions.assertEquals(String.format("username-%d", i), users.get(i).getUsername());
         }
 
-        int updatedSize = 323;
+        int updatedSize = 1323;
         mockGetUsers(updatedSize, false);
 
         // Should still have the initial size because of the cache