Adding some tests

elastic · Oct 5, 2020 · 51244dd · 51244dd
1 parent 37bd0a0
commit 51244dd
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 2 deletions.
diff --git a/src/core/server/elasticsearch/client/client_config.test.ts b/src/core/server/elasticsearch/client/client_config.test.ts
@@ -37,7 +37,7 @@ const createConfig = (
 };
 
 describe('parseClientOptions', () => {
-  it('includes `KIBANA_HEADERS`', () => {
+  it('includes headers designing the HTTP request as originating from Kibana by default', () => {
     const config = createConfig({});
 
     expect(parseClientOptions(config, false)).toEqual(
@@ -69,6 +69,25 @@ describe('parseClientOptions', () => {
       );
     });
 
+    it('`customHeaders` take precedence to default kibana headers', () => {
+      const customHeader = {
+        [Object.keys(KIBANA_HEADERS)[0]]: 'foo',
+      };
+      const config = createConfig({
+        customHeaders: {
+          ...customHeader,
+        },
+      });
+
+      expect(parseClientOptions(config, false)).toEqual(
+        expect.objectContaining({
+          headers: {
+            ...customHeader,
+          },
+        })
+      );
+    });
+
     it('`keepAlive` option', () => {
       expect(parseClientOptions(createConfig({ keepAlive: true }), false)).toEqual(
         expect.objectContaining({ agent: { keepAlive: true } })

diff --git a/src/core/server/elasticsearch/client/cluster_client.test.ts b/src/core/server/elasticsearch/client/cluster_client.test.ts
@@ -278,6 +278,52 @@ describe('ClusterClient', () => {
       });
     });
 
+    it('respect the precedence of config headers over default headers', () => {
+      const headerKey = Object.keys(KIBANA_HEADERS)[0];
+      const config = createConfig({
+        customHeaders: {
+          [headerKey]: 'foo',
+        },
+      });
+      getAuthHeaders.mockReturnValue({});
+
+      const clusterClient = new ClusterClient(config, logger, getAuthHeaders);
+      const request = httpServerMock.createKibanaRequest();
+
+      clusterClient.asScoped(request);
+
+      expect(scopedClient.child).toHaveBeenCalledTimes(1);
+      expect(scopedClient.child).toHaveBeenCalledWith({
+        headers: {
+          [headerKey]: 'foo',
+          'x-opaque-id': expect.any(String),
+        },
+      });
+    });
+
+    it('respect the precedence of request headers over default headers', () => {
+      const headerKey = Object.keys(KIBANA_HEADERS)[0];
+      const config = createConfig({
+        requestHeadersWhitelist: [headerKey],
+      });
+      getAuthHeaders.mockReturnValue({});
+
+      const clusterClient = new ClusterClient(config, logger, getAuthHeaders);
+      const request = httpServerMock.createKibanaRequest({
+        headers: { [headerKey]: 'foo' },
+      });
+
+      clusterClient.asScoped(request);
+
+      expect(scopedClient.child).toHaveBeenCalledTimes(1);
+      expect(scopedClient.child).toHaveBeenCalledWith({
+        headers: {
+          [headerKey]: 'foo',
+          'x-opaque-id': expect.any(String),
+        },
+      });
+    });
+
     it('respect the precedence of x-opaque-id header over config headers', () => {
       const config = createConfig({
         customHeaders: {

diff --git a/src/core/server/elasticsearch/kibana_headers.ts b/src/core/server/elasticsearch/kibana_headers.ts
@@ -18,5 +18,5 @@
  */
 
 export const KIBANA_HEADERS = {
-  'X-elastic-product-origin': 'kibana',
+  'x-elastic-product-origin': 'kibana',
 };