renamed types to match pattern

Author: mattapperson

x-pack/plugins/beats/server/lib/adapters/beats/adapter_types.ts

@@ -17,29 +17,29 @@ export interface CMBeatsAdapter {
   verifyBeats(req: FrameworkRequest, beatIds: string[]): any;
   removeTagsFromBeats(
     req: FrameworkRequest,
-    removals: CMTagAssignment[]
-  ): Promise<CMTagAssignment[]>;
+    removals: BeatsTagAssignment[]
+  ): Promise<BeatsTagAssignment[]>;
   assignTagsToBeats(
     req: FrameworkRequest,
-    assignments: CMTagAssignment[]
-  ): Promise<CMTagAssignment[]>;
+    assignments: BeatsTagAssignment[]
+  ): Promise<BeatsTagAssignment[]>;
 }
 
-export interface CMTagAssignment {
+export interface BeatsTagAssignment {
   beatId: string;
   tag: string;
   idxInRequest?: number;
 }
 
-interface CMReturnedTagAssignment {
+interface BeatsReturnedTagAssignment {
   status: number | null;
   result?: string;
 }
 
 export interface CMAssignmentReturn {
-  assignments: CMReturnedTagAssignment[];
+  assignments: BeatsReturnedTagAssignment[];
 }
 
-export interface CMRemovalReturn {
-  removals: CMReturnedTagAssignment[];
+export interface BeatsRemovalReturn {
+  removals: BeatsReturnedTagAssignment[];
 }

x-pack/plugins/beats/server/lib/adapters/beats/elasticsearch_beats_adapter.ts

@@ -10,7 +10,7 @@ import { INDEX_NAMES } from '../../../../common/constants';
 import { CMBeat } from '../../../../common/domain_types';
 import { DatabaseAdapter } from '../database/adapter_types';
 import { FrameworkRequest } from '../famework/adapter_types';
-import { CMBeatsAdapter, CMTagAssignment } from './adapter_types';
+import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types';
 
 export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
   private database: DatabaseAdapter;
@@ -125,8 +125,8 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
 
   public async removeTagsFromBeats(
     req: FrameworkRequest,
-    removals: CMTagAssignment[]
-  ): Promise<CMTagAssignment[]> {
+    removals: BeatsTagAssignment[]
+  ): Promise<BeatsTagAssignment[]> {
     const body = flatten(
       removals.map(({ beatId, tag }) => {
         const script =
@@ -160,8 +160,8 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
 
   public async assignTagsToBeats(
     req: FrameworkRequest,
-    assignments: CMTagAssignment[]
-  ): Promise<CMTagAssignment[]> {
+    assignments: BeatsTagAssignment[]
+  ): Promise<BeatsTagAssignment[]> {
     const body = flatten(
       assignments.map(({ beatId, tag }) => {
         const script =

x-pack/plugins/beats/server/lib/adapters/database/__tests__/kibana.test.ts

@@ -9,7 +9,7 @@
 import { createEsTestCluster } from '@kbn/test';
 // @ts-ignore
 import * as kbnTestServer from '../../../../../../../../src/test_utils/kbn_server';
-import { KbnElasticSearch } from '../adapter_types';
+import { DatabaseKbnESPlugin } from '../adapter_types';
 import { KibanaDatabaseAdapter } from '../kibana_database_adapter';
 import { contractTests } from './test_contract';
 
@@ -29,6 +29,6 @@ contractTests('Kibana Database Adapter', {
   },
   adapterSetup: () => {
     return new KibanaDatabaseAdapter(kbnServer.server.plugins
-      .elasticsearch as KbnElasticSearch);
+      .elasticsearch as DatabaseKbnESPlugin);
   },
 });