Merge pull request #32 from elastic/update-prod-check

elastic · Nov 23, 2021 · cba8562 · cba8562
2 parents 8dacef2 + ede51ca
commit cba8562
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 77 deletions.
diff --git a/src/Transport.ts b/src/Transport.ts
@@ -459,7 +459,7 @@ export default class Transport {
         result.statusCode = statusCode
         result.headers = headers
 
-        if (this[kProductCheck] != null && headers['x-elastic-product'] !== this[kProductCheck] && statusCode !== 401 && statusCode !== 403) {
+        if (this[kProductCheck] != null && headers['x-elastic-product'] !== this[kProductCheck] && statusCode >= 200 && statusCode < 300) {
           throw new ProductNotSupportedError(this[kProductCheck] as string, result)
         }
 

diff --git a/src/connection/UndiciConnection.ts b/src/connection/UndiciConnection.ts
@@ -29,7 +29,7 @@ import BaseConnection, {
   ConnectionRequestResponse,
   getIssuerCertificate
 } from './BaseConnection'
-import { Pool, buildConnector } from 'undici'
+import { Pool, buildConnector, Dispatcher } from 'undici'
 import {
   ConfigurationError,
   RequestAbortedError,
@@ -152,7 +152,7 @@ export default class Connection extends BaseConnection {
     let response
     try {
       // @ts-expect-error method it's fine as string
-      response = await this.pool.request(requestParams)
+      response = (await this.pool.request(requestParams)) as Dispatcher.ResponseData
       if (timeoutId != null) clearTimeout(timeoutId)
     } catch (err: any) {
       if (timeoutId != null) clearTimeout(timeoutId)
@@ -169,13 +169,13 @@ export default class Connection extends BaseConnection {
     }
 
     const contentEncoding = (response.headers['content-encoding'] ?? '').toLowerCase()
-    const isCompressed = contentEncoding.includes('gzip') || contentEncoding.includes('deflate')
+    const isCompressed = contentEncoding.includes('gzip') || contentEncoding.includes('deflate') // eslint-disable-line
     const isVectorTile = (response.headers['content-type'] ?? '').includes('application/vnd.mapbox-vector-tile')
 
     /* istanbul ignore else */
     if (response.headers['content-length'] !== undefined) {
       const contentLength = Number(response.headers['content-length'])
-      if (isCompressed && contentLength > maxCompressedResponseSize) {
+      if (isCompressed && contentLength > maxCompressedResponseSize) { // eslint-disable-line
         response.body.destroy()
         throw new RequestAbortedError(`The content length (${contentLength}) is bigger than the maximum allowed buffer (${maxCompressedResponseSize})`)
       } else if (contentLength > maxResponseSize) {
@@ -186,7 +186,7 @@ export default class Connection extends BaseConnection {
 
     this.diagnostic.emit('deserialization', null, options)
     try {
-      if (isCompressed || isVectorTile) {
+      if (isCompressed || isVectorTile) { // eslint-disable-line
         const payload: Buffer[] = []
         for await (const chunk of response.body) {
           payload.push(chunk)

diff --git a/test/acceptance/product-check.test.ts b/test/acceptance/product-check.test.ts
@@ -133,82 +133,49 @@ test('Errors v8', async t => {
   }
 })
 
-test('401', async t => {
-  t.plan(2)
-
-  const MockConnection = buildMockConnection({
-    onRequest (params) {
-      return {
-        statusCode: 401,
-        headers: {
-          'x-elastic-product': undefined
-        },
-        body: { error: true }
-      }
-    }
-  })
-
-  const client = new TestClient({
-    node: 'http://localhost:9200',
-    Connection: MockConnection
-  })
-
-  client.diagnostic.on(events.RESPONSE, (err, event) => {
-    t.ok(err instanceof errors.ResponseError)
-  })
-
-  try {
-    await client.request({
-      path: '/foo/_search',
-      method: 'POST',
-      body: {
-        query: {
-          match_all: {}
+function withCode (code: number): void {
+  test(`With code ${code}`, async t => {
+    t.plan(2)
+
+    const MockConnection = buildMockConnection({
+      onRequest (params) {
+        return {
+          statusCode: code,
+          headers: {
+            'x-elastic-product': undefined
+          },
+          body: { error: true }
         }
       }
     })
-    t.fail('Should throw')
-  } catch (err: any) {
-    t.equal(err.statusCode, 401)
-  }
-})
-
-test('403', async t => {
-  t.plan(2)
 
-  const MockConnection = buildMockConnection({
-    onRequest (params) {
-      return {
-        statusCode: 403,
-        headers: {
-          'x-elastic-product': undefined
-        },
-        body: { error: true }
-      }
-    }
-  })
+    const client = new TestClient({
+      node: 'http://localhost:9200',
+      Connection: MockConnection
+    })
 
-  const client = new TestClient({
-    node: 'http://localhost:9200',
-    Connection: MockConnection
-  })
+    client.diagnostic.on(events.RESPONSE, (err, event) => {
+      t.ok(err instanceof errors.ResponseError)
+    })
 
-  client.diagnostic.on(events.RESPONSE, (err, event) => {
-    t.ok(err instanceof errors.ResponseError)
+    try {
+      await client.request({
+        path: '/foo/_search',
+        method: 'POST',
+        body: {
+          query: {
+            match_all: {}
+          }
+        }
+      })
+      t.fail('Should throw')
+    } catch (err: any) {
+      t.equal(err.statusCode, code)
+    }
   })
+}
 
-  try {
-    await client.request({
-      path: '/foo/_search',
-      method: 'POST',
-      body: {
-        query: {
-          match_all: {}
-        }
-      }
-    })
-    t.fail('Should throw')
-  } catch (err: any) {
-    t.equal(err.statusCode, 403)
-  }
-})
+withCode(401)
+withCode(403)
+withCode(404)
+withCode(413)