From 2bd3e94e7e527884d1320e6c48f6ee1dfb8fe8dd Mon Sep 17 00:00:00 2001
From: Marco Vettorello <vettorello.marco@gmail.com>
Date: Fri, 14 Dec 2018 20:39:31 +0100
Subject: [PATCH] Add shardTimeout params to body only if not 0 (#27217)
 (#27234)

* Add timeout params to body only if not 0

* Add unit tests
---
 .../serialize_fetch_params.js                 |  4 ++-
 .../serialize_fetch_params.test.js            | 36 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js b/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js
index 209dff734a1c..c111e85888f3 100644
--- a/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js
+++ b/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js
@@ -73,9 +73,11 @@ export function serializeFetchParams(
       })
       .then(function (indexList) {
         let body = {
-          timeout: `${esShardTimeout}ms`,
           ...fetchParams.body || {},
         };
+        if (esShardTimeout > 0) {
+          body.timeout = `${esShardTimeout}ms`;
+        }
         let index = [];
         // If we've reached this point and there are no indexes in the
         // index list at all, it means that we shouldn't expect any indexes
diff --git a/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.test.js b/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.test.js
index 149d417a9e55..804721e45347 100644
--- a/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.test.js
+++ b/src/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.test.js
@@ -35,7 +35,8 @@ function serializeFetchParamsWithDefaults(paramOverrides) {
       get: () => {
         return 'sessionId';
       }
-    }
+    },
+    timeout: 100,
   };
   const params = { ...paramDefaults, ...paramOverrides };
 
@@ -46,6 +47,7 @@ function serializeFetchParamsWithDefaults(paramOverrides) {
     params.kbnIndex,
     params.sessionId,
     params.config,
+    params.timeout,
   );
 }
 
@@ -165,3 +167,35 @@ describe('headers', () => {
     });
   });
 });
+
+describe('body', () => {
+  const requestFetchParams = [
+    {
+      index: ['logstash-123'],
+      type: 'blah',
+      search_type: 'blah2',
+      body: { foo: 'bar' }
+    }
+  ];
+
+  const getBody = async (paramOverrides) => {
+    const request = await serializeFetchParamsWithDefaults(paramOverrides);
+    const requestParts = request.split('\n');
+    if (requestParts.length < 2) {
+      throw new Error('fetch Body does not contain expected format: header newline body.');
+    }
+    return JSON.parse(requestParts[1]);
+  };
+
+  describe('timeout', () => {
+    test('should set a timeout as specified', async () => {
+      const request = await getBody({ requestFetchParams, timeout: 200 });
+      expect(request).toHaveProperty('timeout', '200ms');
+    });
+
+    test('should not set a timeout when timeout is 0', async () => {
+      const request = await getBody({ requestFetchParams, timeout: 0 });
+      expect(request).not.toHaveProperty('timeout');
+    });
+  });
+});