From c2f01ce8e5d33c99218c6d3028aa15a5f65c2d42 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <smith@nlsmith.com>
Date: Fri, 2 Oct 2020 10:55:58 -0500
Subject: [PATCH] More type fixing

---
 .../service_map/group_resource_nodes.test.ts  |  3 +-
 .../annotations/__fixtures__/no_versions.json |  2 +-
 .../lib/services/annotations/index.test.ts    | 28 +++++++++++++++----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/service_map/group_resource_nodes.test.ts b/x-pack/plugins/apm/server/lib/service_map/group_resource_nodes.test.ts
index babb787472881..c3238963eedee 100644
--- a/x-pack/plugins/apm/server/lib/service_map/group_resource_nodes.test.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/group_resource_nodes.test.ts
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ConnectionElement } from '../../../common/service_map';
 import { groupResourceNodes } from './group_resource_nodes';
-import preGroupedData from './mock_responses/group_resource_nodes_pregrouped.json';
 import expectedGroupedData from './mock_responses/group_resource_nodes_grouped.json';
+import preGroupedData from './mock_responses/group_resource_nodes_pregrouped.json';
 
 describe('groupResourceNodes', () => {
   it('should group external nodes', () => {
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/__fixtures__/no_versions.json b/x-pack/plugins/apm/server/lib/services/annotations/__fixtures__/no_versions.json
index fa5c63f1b9a54..863d4bed998e9 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/__fixtures__/no_versions.json
+++ b/x-pack/plugins/apm/server/lib/services/annotations/__fixtures__/no_versions.json
@@ -12,7 +12,7 @@
       "value": 10000,
       "relation": "gte"
     },
-    "max_score": null,
+    "max_score": 0,
     "hits": []
   },
   "aggregations": {
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts b/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts
index e1a3ee1c9380d..036a4c0951ba8 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts
@@ -3,14 +3,18 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { getDerivedServiceAnnotations } from './get_derived_service_annotations';
 import {
-  SearchParamsMock,
+  ESSearchRequest,
+  ESSearchResponse,
+} from '../../../../typings/elasticsearch';
+import {
   inspectSearchParams,
+  SearchParamsMock,
 } from '../../../utils/test_helpers';
+import { getDerivedServiceAnnotations } from './get_derived_service_annotations';
+import multipleVersions from './__fixtures__/multiple_versions.json';
 import noVersions from './__fixtures__/no_versions.json';
 import oneVersion from './__fixtures__/one_version.json';
-import multipleVersions from './__fixtures__/multiple_versions.json';
 import versionsFirstSeen from './__fixtures__/versions_first_seen.json';
 
 describe('getServiceAnnotations', () => {
@@ -50,7 +54,14 @@ describe('getServiceAnnotations', () => {
             searchAggregatedTransactions: false,
           }),
         {
-          mockResponse: () => oneVersion,
+          mockResponse: () =>
+            oneVersion as ESSearchResponse<
+              unknown,
+              ESSearchRequest,
+              {
+                restTotalHitsAsInt: false;
+              }
+            >,
         }
       );
 
@@ -74,7 +85,14 @@ describe('getServiceAnnotations', () => {
             searchAggregatedTransactions: false,
           }),
         {
-          mockResponse: () => responses.shift(),
+          mockResponse: () =>
+            (responses.shift() as unknown) as ESSearchResponse<
+              unknown,
+              ESSearchRequest,
+              {
+                restTotalHitsAsInt: false;
+              }
+            >,
         }
       );