fix

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryDaoImpl.java

@@ -64,6 +64,9 @@ public void removeOlderDeliveries(long webhookId, long limit) {
         SearchCriteria<WebhookDeliveryVO> sc = sb.create();
         sc.setParameters("webhookId", webhookId);
         List<WebhookDeliveryVO> keep = listBy(sc, searchFilter);
+        if (keep.size() < limit) {
+            return;
+        }
         SearchBuilder<WebhookDeliveryVO> sbDelete = createSearchBuilder();
         sbDelete.and("id", sbDelete.entity().getId(), SearchCriteria.Op.NOTIN);
         SearchCriteria<WebhookDeliveryVO> scDelete = sbDelete.create();

plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryDaoImplTest.java

@@ -22,9 +22,11 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -92,7 +94,7 @@ public void deleteByDeleteApiParamsReturnsZeroWhenNoMatchFound() {
 
     @Test
     public void removeOlderDeliveriesWhenParametersMatch() {
-        Long webhookId = 2L;
+        long webhookId = 2L;
 
         WebhookDeliveryVO d1 = mock(WebhookDeliveryVO.class);
         when(d1.getId()).thenReturn(1L);
@@ -109,4 +111,16 @@ public void removeOlderDeliveriesWhenParametersMatch() {
         verify(mockSearchBuilder).and(eq("id"), any(), eq(SearchCriteria.Op.NOTIN));
         verify(mockSearchCriteria).setParameters("id", 1L, 2L);
     }
+
+    @Test
+    public void removeOlderDeliveriesWhenNoKeepDeliveries() {
+        long webhookId = 2L;
+        doReturn(Collections.emptyList()).when(webhookDeliveryDao).listBy(any(SearchCriteria.class), any());
+
+        webhookDeliveryDao.removeOlderDeliveries(webhookId, 10);
+        verify(webhookDeliveryDao, never()).remove(any(SearchCriteria.class));
+        verify(mockSearchBuilder).and(eq("webhookId"), any(), eq(SearchCriteria.Op.EQ));
+        verify(mockSearchCriteria).setParameters("webhookId", webhookId);
+        verify(mockSearchBuilder, never()).and(eq("id"), any(), eq(SearchCriteria.Op.NOTIN));
+    }
 }

test/integration/smoke/test_webhook_lifecycle.py

@@ -283,7 +283,7 @@ def test_11_update_webhook(self):
             description=description,
             secretkey=secretkey,
             state=state
-        )['webhook']
+        )
         self.assertNotEqual(
             updated_webhook,
             None,