[kbn-ftr-common-functional-services] extend retry service

packages/kbn-ftr-common-functional-services/services/retry/retry.ts

@@ -10,17 +10,31 @@ import { FtrService } from '../ftr_provider_context';
 import { retryForSuccess } from './retry_for_success';
 import { retryForTruthy } from './retry_for_truthy';
 
+interface TryWithRetriesOptions {
+  retryCount: number;
+  retryDelay?: number;
+  timeout?: number;
+}
+
 export class RetryService extends FtrService {
   private readonly config = this.ctx.getService('config');
   private readonly log = this.ctx.getService('log');
 
+  /**
+   * Use to retry block within {timeout} period and return block result.
+   * @param timeout retrying timeout
+   * @param block retriable action
+   * @param onFailureBlock optional action to run before the new retriable action attempt
+   * @param retryDelay optional delay before the new attempt
+   * @returns result from retriable action
+   */
   public async tryForTime<T>(
     timeout: number,
     block: () => Promise<T>,
     onFailureBlock?: () => Promise<T>,
     retryDelay?: number
   ) {
-    return await retryForSuccess(this.log, {
+    return await retryForSuccess<T>(this.log, {
       timeout,
       methodName: 'retry.tryForTime',
       block,
@@ -43,6 +57,13 @@ export class RetryService extends FtrService {
     });
   }
 
+  /**
+   * Use to wait for block condition to be true
+   * @param description description for retriable action
+   * @param timeout retrying timeout
+   * @param block retriable action
+   * @param onFailureBlock optional action to run before the new retriable action attempt
+   */
   public async waitForWithTimeout(
     description: string,
     timeout: number,
@@ -71,4 +92,31 @@ export class RetryService extends FtrService {
       onFailureBlock,
     });
   }
+
+  /**
+   * Use to retry block {options.retryCount} times within {options.timeout} period and return block result
+   * @param description description for retriable action
+   * @param block retriable action
+   * @param options options.retryCount for how many attempts to retry
+   * @param onFailureBlock optional action to run before the new retriable action attempt
+   * @returns result from retriable action
+   */
+  public async tryWithRetries<T>(
+    description: string,
+    block: () => Promise<T>,
+    options: TryWithRetriesOptions,
+    onFailureBlock?: () => Promise<T>
+  ): Promise<T> {
+    const { retryCount, timeout = this.config.get('timeouts.try'), retryDelay = 200 } = options;
+
+    return await retryForSuccess<T>(this.log, {
+      description,
+      timeout,
+      methodName: 'retry.tryWithRetries',
+      block,
+      onFailureBlock,
+      retryDelay,
+      retryCount,
+    });
+  }
 }

packages/kbn-ftr-common-functional-services/services/retry/retry_for_success.ts

@@ -13,9 +13,9 @@ const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 const returnTrue = () => true;
 
-const defaultOnFailure = (methodName: string) => (lastError: Error | undefined) => {
+const defaultOnFailure = (methodName: string) => (lastError: Error | undefined, reason: string) => {
   throw new Error(
-    `${methodName} timeout${lastError ? `: ${lastError.stack || lastError.message}` : ''}`
+    `${methodName} ${reason}\n${lastError ? `${lastError.stack || lastError.message}` : ''}`
   );
 };
 
@@ -44,32 +44,51 @@ interface Options<T> {
   onFailureBlock?: () => Promise<T>;
   onFailure?: ReturnType<typeof defaultOnFailure>;
   accept?: (v: T) => boolean;
+  description?: string;
   retryDelay?: number;
+  retryCount?: number;
 }
 
 export async function retryForSuccess<T>(log: ToolingLog, options: Options<T>) {
   const {
+    description,
     timeout,
     methodName,
     block,
     onFailureBlock,
+    onFailure = defaultOnFailure(methodName),
     accept = returnTrue,
     retryDelay = 502,
+    retryCount,
   } = options;
-  const { onFailure = defaultOnFailure(methodName) } = options;
 
   const start = Date.now();
   const criticalWebDriverErrors = ['NoSuchSessionError', 'NoSuchWindowError'];
   let lastError;
+  let attemptCounter = 0;
+  const addText = (str: string | undefined) => (str ? ` waiting for '${str}'` : '');
 
   while (true) {
+    // Aborting if no retry attempts are left (opt-in)
+    if (retryCount && ++attemptCounter > retryCount) {
+      onFailure(
+        lastError,
+        // optionally extend error message with description
+        `reached the limit of attempts${addText(description)}: ${
+          attemptCounter - 1
+        } out of ${retryCount}`
+      );
+    }
+    // Aborting if timeout is reached
     if (Date.now() - start > timeout) {
-      await onFailure(lastError);
-      throw new Error('expected onFailure() option to throw an error');
-    } else if (lastError && criticalWebDriverErrors.includes(lastError.name)) {
-      // Aborting retry since WebDriver session is invalid or browser window is closed
+      onFailure(lastError, `reached timeout ${timeout} ms${addText(description)}`);
+    }
+    // Aborting if WebDriver session is invalid or browser window is closed
+    if (lastError && criticalWebDriverErrors.includes(lastError.name)) {
       throw new Error('WebDriver session is invalid, retry was aborted');
-    } else if (lastError && onFailureBlock) {
+    }
+    // Run opt-in onFailureBlock before the next attempt
+    if (lastError && onFailureBlock) {
       const before = await runAttempt(onFailureBlock);
       if ('error' in before) {
         log.debug(`--- onRetryBlock error: ${before.error.message}`);

x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/bundled_prebuilt_rules_package/trial_license_complete_tier/install_latest_bundled_prebuilt_rules.ts

@@ -61,8 +61,7 @@ export default ({ getService }: FtrProviderContext): void => {
         es,
         supertest,
         '99.0.0',
-        retry,
-        log
+        retry
       );
 
       // As opposed to "registry"

x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/bundled_prebuilt_rules_package/trial_license_complete_tier/prerelease_packages.ts

@@ -49,8 +49,7 @@ export default ({ getService }: FtrProviderContext): void => {
       const fleetPackageInstallationResponse = await installPrebuiltRulesPackageViaFleetAPI(
         es,
         supertest,
-        retry,
-        log
+        retry
       );
 
       expect(fleetPackageInstallationResponse.items.length).toBe(1);

x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/fleet_integration.ts

@@ -49,7 +49,6 @@ export default ({ getService }: FtrProviderContext): void => {
         supertest,
         overrideExistingPackage: true,
         retryService: retry,
-        log,
       });
 
       // Verify that status is updated after package installation

x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/update_prebuilt_rules_package/trial_license_complete_tier/update_prebuilt_rules_package.ts

@@ -107,8 +107,7 @@ export default ({ getService }: FtrProviderContext): void => {
         es,
         supertest,
         previousVersion,
-        retry,
-        log
+        retry
       );
 
       expect(installPreviousPackageResponse._meta.install_source).toBe('registry');
@@ -161,8 +160,7 @@ export default ({ getService }: FtrProviderContext): void => {
         es,
         supertest,
         currentVersion,
-        retry,
-        log
+        retry
       );
       expect(installLatestPackageResponse.items.length).toBeGreaterThanOrEqual(0);
 

x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/index.ts

@@ -22,5 +22,4 @@ export * from './wait_for_index_to_populate';
 export * from './get_stats';
 export * from './get_detection_metrics_from_body';
 export * from './get_stats_url';
-export * from './retry';
 export * from './combine_to_ndjson';

x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/install_fleet_package_by_url.ts

@@ -9,9 +9,7 @@ import type SuperTest from 'supertest';
 import { InstallPackageResponse } from '@kbn/fleet-plugin/common/types';
 import { epmRouteService } from '@kbn/fleet-plugin/common';
 import { RetryService } from '@kbn/ftr-common-functional-services';
-import type { ToolingLog } from '@kbn/tooling-log';
 import expect from 'expect';
-import { retry } from '../../retry';
 import { refreshSavedObjectIndices } from '../../refresh_index';
 
 const MAX_RETRIES = 2;
@@ -29,11 +27,11 @@ const ATTEMPT_TIMEOUT = 120000;
 export const installPrebuiltRulesPackageViaFleetAPI = async (
   es: Client,
   supertest: SuperTest.SuperTest<SuperTest.Test>,
-  retryService: RetryService,
-  log: ToolingLog
+  retryService: RetryService
 ): Promise<InstallPackageResponse> => {
-  const fleetResponse = await retry<InstallPackageResponse>({
-    test: async () => {
+  const fleetResponse = await retryService.tryWithRetries<InstallPackageResponse>(
+    installPrebuiltRulesPackageViaFleetAPI.name,
+    async () => {
       const testResponse = await supertest
         .post(`/api/fleet/epm/packages/security_detection_engine`)
         .set('kbn-xsrf', 'xxxx')
@@ -46,12 +44,11 @@ export const installPrebuiltRulesPackageViaFleetAPI = async (
 
       return testResponse.body;
     },
-    utilityName: installPrebuiltRulesPackageViaFleetAPI.name,
-    retryService,
-    retries: MAX_RETRIES,
-    timeout: ATTEMPT_TIMEOUT,
-    log,
-  });
+    {
+      retryCount: MAX_RETRIES,
+      timeout: ATTEMPT_TIMEOUT,
+    }
+  );
 
   await refreshSavedObjectIndices(es);
 
@@ -71,11 +68,11 @@ export const installPrebuiltRulesPackageByVersion = async (
   es: Client,
   supertest: SuperTest.SuperTest<SuperTest.Test>,
   version: string,
-  retryService: RetryService,
-  log: ToolingLog
+  retryService: RetryService
 ): Promise<InstallPackageResponse> => {
-  const fleetResponse = await retry<InstallPackageResponse>({
-    test: async () => {
+  const fleetResponse = await retryService.tryWithRetries<InstallPackageResponse>(
+    installPrebuiltRulesPackageByVersion.name,
+    async () => {
       const testResponse = await supertest
         .post(epmRouteService.getInstallPath('security_detection_engine', version))
         .set('kbn-xsrf', 'xxxx')
@@ -88,12 +85,11 @@ export const installPrebuiltRulesPackageByVersion = async (
 
       return testResponse.body;
     },
-    utilityName: installPrebuiltRulesPackageByVersion.name,
-    retryService,
-    retries: MAX_RETRIES,
-    timeout: ATTEMPT_TIMEOUT,
-    log,
-  });
+    {
+      retryCount: MAX_RETRIES,
+      timeout: ATTEMPT_TIMEOUT,
+    }
+  );
 
   await refreshSavedObjectIndices(es);