Merge branch 'master' into fix-flake-tests

elastic · Oct 20, 2021 · b2e398b · b2e398b
2 parents 8aae1a3 + 5d1b510
commit b2e398b
Show file tree

Hide file tree

Showing 47 changed files with 794 additions and 561 deletions.
diff --git a/api_docs/security_solution.json b/api_docs/security_solution.json
@@ -772,17 +772,17 @@
     "interfaces": [
       {
         "parentPluginId": "securitySolution",
-        "id": "def-server.AppRequestContext",
+        "id": "def-server.SecuritySolutionApiRequestHandlerContext",
         "type": "Interface",
         "tags": [],
-        "label": "AppRequestContext",
+        "label": "SecuritySolutionApiRequestHandlerContext",
         "description": [],
         "path": "x-pack/plugins/security_solution/server/types.ts",
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "securitySolution",
-            "id": "def-server.AppRequestContext.getAppClient",
+            "id": "def-server.SecuritySolutionApiRequestHandlerContext.getAppClient",
             "type": "Function",
             "tags": [],
             "label": "getAppClient",
@@ -804,7 +804,7 @@
           },
           {
             "parentPluginId": "securitySolution",
-            "id": "def-server.AppRequestContext.getSpaceId",
+            "id": "def-server.SecuritySolutionApiRequestHandlerContext.getSpaceId",
             "type": "Function",
             "tags": [],
             "label": "getSpaceId",
@@ -819,7 +819,7 @@
           },
           {
             "parentPluginId": "securitySolution",
-            "id": "def-server.AppRequestContext.getExecutionLogClient",
+            "id": "def-server.SecuritySolutionApiRequestHandlerContext.getExecutionLogClient",
             "type": "Function",
             "tags": [],
             "label": "getExecutionLogClient",
@@ -31438,4 +31438,4 @@
       }
     ]
   }
-}
+}
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -41,7 +41,7 @@ import {
   SPACE_IDS,
 } from '../../common/technical_rule_data_field_names';
 import { ParsedTechnicalFields } from '../../common/parse_technical_fields';
-import { Dataset, RuleDataPluginService } from '../rule_data_plugin_service';
+import { Dataset, IRuleDataService } from '../rule_data_plugin_service';
 
 const getEsQueryConfig: typeof getEsQueryConfigTyped = getEsQueryConfigNonTyped;
 const getSafeSortIds: typeof getSafeSortIdsTyped = getSafeSortIdsNonTyped;
@@ -71,7 +71,7 @@ export interface ConstructorOptions {
   authorization: PublicMethodsOf<AlertingAuthorization>;
   auditLogger?: AuditLogger;
   esClient: ElasticsearchClient;
-  ruleDataService: RuleDataPluginService;
+  ruleDataService: IRuleDataService;
 }
 
 export interface UpdateOptions<Params extends AlertTypeParams> {
@@ -116,7 +116,7 @@ export class AlertsClient {
   private readonly authorization: PublicMethodsOf<AlertingAuthorization>;
   private readonly esClient: ElasticsearchClient;
   private readonly spaceId: string | undefined;
-  private readonly ruleDataService: RuleDataPluginService;
+  private readonly ruleDataService: IRuleDataService;
 
   constructor(options: ConstructorOptions) {
     this.logger = options.logger;

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts
@@ -13,8 +13,7 @@ import { loggingSystemMock } from 'src/core/server/mocks';
 import { securityMock } from '../../../security/server/mocks';
 import { AuditLogger } from '../../../security/server';
 import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
-import { ruleDataPluginServiceMock } from '../rule_data_plugin_service/rule_data_plugin_service.mock';
-import { RuleDataPluginService } from '../rule_data_plugin_service';
+import { ruleDataServiceMock } from '../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 jest.mock('./alerts_client');
 
@@ -26,7 +25,7 @@ const alertsClientFactoryParams: AlertsClientFactoryProps = {
   getAlertingAuthorization: (_: KibanaRequest) => alertingAuthMock,
   securityPluginSetup,
   esClient: {} as ElasticsearchClient,
-  ruleDataService: ruleDataPluginServiceMock.create() as unknown as RuleDataPluginService,
+  ruleDataService: ruleDataServiceMock.create(),
 };
 
 const fakeRequest = {

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts
@@ -9,15 +9,15 @@ import { PublicMethodsOf } from '@kbn/utility-types';
 import { ElasticsearchClient, KibanaRequest, Logger } from 'src/core/server';
 import { AlertingAuthorization } from '../../../alerting/server';
 import { SecurityPluginSetup } from '../../../security/server';
-import { RuleDataPluginService } from '../rule_data_plugin_service';
+import { IRuleDataService } from '../rule_data_plugin_service';
 import { AlertsClient } from './alerts_client';
 
 export interface AlertsClientFactoryProps {
   logger: Logger;
   esClient: ElasticsearchClient;
   getAlertingAuthorization: (request: KibanaRequest) => PublicMethodsOf<AlertingAuthorization>;
   securityPluginSetup: SecurityPluginSetup | undefined;
-  ruleDataService: RuleDataPluginService | null;
+  ruleDataService: IRuleDataService | null;
 }
 
 export class AlertsClientFactory {
@@ -28,7 +28,7 @@ export class AlertsClientFactory {
     request: KibanaRequest
   ) => PublicMethodsOf<AlertingAuthorization>;
   private securityPluginSetup!: SecurityPluginSetup | undefined;
-  private ruleDataService!: RuleDataPluginService | null;
+  private ruleDataService!: IRuleDataService | null;
 
   public initialize(options: AlertsClientFactoryProps) {
     /**

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts
@@ -19,8 +19,7 @@ import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mo
 import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
 import { AuditLogger } from '../../../../security/server';
 import { AlertingAuthorizationEntity } from '../../../../alerting/server';
-import { ruleDataPluginServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
-import { RuleDataPluginService } from '../../rule_data_plugin_service';
+import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const esClientMock = elasticsearchClientMock.createElasticsearchClient();
@@ -33,7 +32,7 @@ const alertsClientParams: jest.Mocked<ConstructorOptions> = {
   authorization: alertingAuthMock,
   esClient: esClientMock,
   auditLogger,
-  ruleDataService: ruleDataPluginServiceMock.create() as unknown as RuleDataPluginService,
+  ruleDataService: ruleDataServiceMock.create(),
 };
 
 const DEFAULT_SPACE = 'test_default_space_id';

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
@@ -18,8 +18,7 @@ import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mo
 import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
 import { AuditLogger } from '../../../../security/server';
 import { AlertingAuthorizationEntity } from '../../../../alerting/server';
-import { ruleDataPluginServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
-import { RuleDataPluginService } from '../../rule_data_plugin_service';
+import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const esClientMock = elasticsearchClientMock.createElasticsearchClient();
@@ -32,7 +31,7 @@ const alertsClientParams: jest.Mocked<ConstructorOptions> = {
   authorization: alertingAuthMock,
   esClient: esClientMock,
   auditLogger,
-  ruleDataService: ruleDataPluginServiceMock.create() as unknown as RuleDataPluginService,
+  ruleDataService: ruleDataServiceMock.create(),
 };
 
 const DEFAULT_SPACE = 'test_default_space_id';

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
@@ -19,8 +19,7 @@ import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mo
 import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
 import { AuditLogger } from '../../../../security/server';
 import { AlertingAuthorizationEntity } from '../../../../alerting/server';
-import { ruleDataPluginServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
-import { RuleDataPluginService } from '../../rule_data_plugin_service';
+import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const esClientMock = elasticsearchClientMock.createElasticsearchClient();
@@ -33,7 +32,7 @@ const alertsClientParams: jest.Mocked<ConstructorOptions> = {
   authorization: alertingAuthMock,
   esClient: esClientMock,
   auditLogger,
-  ruleDataService: ruleDataPluginServiceMock.create() as unknown as RuleDataPluginService,
+  ruleDataService: ruleDataServiceMock.create(),
 };
 
 const DEFAULT_SPACE = 'test_default_space_id';

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts
@@ -18,8 +18,7 @@ import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mo
 import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
 import { AuditLogger } from '../../../../security/server';
 import { AlertingAuthorizationEntity } from '../../../../alerting/server';
-import { ruleDataPluginServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
-import { RuleDataPluginService } from '../../rule_data_plugin_service';
+import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const esClientMock = elasticsearchClientMock.createElasticsearchClient();
@@ -32,7 +31,7 @@ const alertsClientParams: jest.Mocked<ConstructorOptions> = {
   authorization: alertingAuthMock,
   esClient: esClientMock,
   auditLogger,
-  ruleDataService: ruleDataPluginServiceMock.create() as unknown as RuleDataPluginService,
+  ruleDataService: ruleDataServiceMock.create(),
 };
 
 const DEFAULT_SPACE = 'test_default_space_id';

diff --git a/x-pack/plugins/rule_registry/server/index.ts b/x-pack/plugins/rule_registry/server/index.ts
@@ -12,7 +12,7 @@ import { PluginInitializerContext } from 'src/core/server';
 import { RuleRegistryPlugin } from './plugin';
 
 export type { RuleRegistryPluginSetupContract, RuleRegistryPluginStartContract } from './plugin';
-export { RuleDataPluginService } from './rule_data_plugin_service';
+export { IRuleDataService, RuleDataPluginService } from './rule_data_plugin_service';
 export { RuleDataClient } from './rule_data_client';
 export { IRuleDataClient } from './rule_data_client/types';
 export type {

diff --git a/x-pack/plugins/rule_registry/server/mocks.ts b/x-pack/plugins/rule_registry/server/mocks.ts
@@ -7,12 +7,17 @@
 
 import { alertsClientMock } from './alert_data_client/alerts_client.mock';
 import { createRuleDataClientMock } from './rule_data_client/rule_data_client.mock';
-import { ruleDataPluginServiceMock } from './rule_data_plugin_service/rule_data_plugin_service.mock';
+import {
+  ruleDataServiceMock,
+  RuleDataServiceMock,
+} from './rule_data_plugin_service/rule_data_plugin_service.mock';
 import { createLifecycleAlertServicesMock } from './utils/lifecycle_alert_services_mock';
 
 export const ruleRegistryMocks = {
   createLifecycleAlertServices: createLifecycleAlertServicesMock,
-  createRuleDataPluginService: ruleDataPluginServiceMock.create,
+  createRuleDataService: ruleDataServiceMock.create,
   createRuleDataClient: createRuleDataClientMock,
   createAlertsClientMock: alertsClientMock,
 };
+
+export { RuleDataServiceMock };
diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts
@@ -20,7 +20,7 @@ import { PluginStartContract as AlertingStart } from '../../alerting/server';
 import { SecurityPluginSetup } from '../../security/server';
 
 import { RuleRegistryPluginConfig } from './config';
-import { RuleDataPluginService } from './rule_data_plugin_service';
+import { IRuleDataService, RuleDataService } from './rule_data_plugin_service';
 import { AlertsClientFactory } from './alert_data_client/alerts_client_factory';
 import { AlertsClient } from './alert_data_client/alerts_client';
 import { RacApiRequestHandlerContext, RacRequestHandlerContext } from './types';
@@ -35,7 +35,7 @@ export interface RuleRegistryPluginStartDependencies {
 }
 
 export interface RuleRegistryPluginSetupContract {
-  ruleDataService: RuleDataPluginService;
+  ruleDataService: IRuleDataService;
 }
 
 export interface RuleRegistryPluginStartContract {
@@ -57,7 +57,7 @@ export class RuleRegistryPlugin
   private readonly logger: Logger;
   private readonly kibanaVersion: string;
   private readonly alertsClientFactory: AlertsClientFactory;
-  private ruleDataService: RuleDataPluginService | null;
+  private ruleDataService: IRuleDataService | null;
   private security: SecurityPluginSetup | undefined;
 
   constructor(initContext: PluginInitializerContext) {
@@ -100,7 +100,7 @@ export class RuleRegistryPlugin
       }
     };
 
-    this.ruleDataService = new RuleDataPluginService({
+    this.ruleDataService = new RuleDataService({
       logger,
       kibanaVersion,
       isWriteEnabled: isWriteEnabled(this.config, this.legacyConfig),

diff --git a/...ck/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock.ts b/...ck/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock.ts
@@ -5,24 +5,20 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
-import { RuleDataPluginService } from './rule_data_plugin_service';
+import { IRuleDataService } from './rule_data_plugin_service';
 
-type Schema = PublicMethodsOf<RuleDataPluginService>;
-
-const createRuleDataPluginService = () => {
-  const mocked: jest.Mocked<Schema> = {
+export const ruleDataServiceMock = {
+  create: (): jest.Mocked<IRuleDataService> => ({
     getResourcePrefix: jest.fn(),
     getResourceName: jest.fn(),
     isWriteEnabled: jest.fn(),
     initializeService: jest.fn(),
     initializeIndex: jest.fn(),
     findIndexByName: jest.fn(),
     findIndicesByFeature: jest.fn(),
-  };
-  return mocked;
+  }),
 };
 
-export const ruleDataPluginServiceMock = {
-  create: createRuleDataPluginService,
-};
+export const RuleDataServiceMock = jest
+  .fn<jest.Mocked<IRuleDataService>, []>()
+  .mockImplementation(ruleDataServiceMock.create);