Skip to content

Commit 5eab7e9

Browse files
[Backport 7.x] Prereleases in meta header should be displayed as p (#1390)
Co-authored-by: Tomas Della Vedova <[email protected]>
1 parent 2be23c0 commit 5eab7e9

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ const Serializer = require('./lib/Serializer')
3333
const errors = require('./lib/errors')
3434
const { ConfigurationError } = errors
3535
const { prepareHeaders } = Connection.internals
36-
const clientVersion = require('./package.json').version
36+
let clientVersion = require('./package.json').version
37+
/* istanbul ignore next */
38+
if (clientVersion.includes('-')) {
39+
// clean prerelease
40+
clientVersion = clientVersion.slice(0, clientVersion.indexOf('-')) + 'p'
41+
}
3742
const nodeVersion = process.versions.node
3843

3944
const kInitialOptions = Symbol('elasticsearchjs-initial-options')

test/unit/client.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ const intoStream = require('into-stream')
2626
const { Client, ConnectionPool, Transport, Connection, errors } = require('../../index')
2727
const { CloudConnectionPool } = require('../../lib/pool')
2828
const { buildServer } = require('../utils')
29-
const clientVersion = require('../../package.json').version
29+
let clientVersion = require('../../package.json').version
30+
if (clientVersion.includes('-')) {
31+
clientVersion = clientVersion.slice(0, clientVersion.indexOf('-')) + 'p'
32+
}
3033
const nodeVersion = process.versions.node
3134

3235
test('Configure host', t => {

test/unit/helpers/bulk.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ const semver = require('semver')
2727
const { test } = require('tap')
2828
const { Client, errors } = require('../../../')
2929
const { buildServer, connection } = require('../../utils')
30-
const clientVersion = require('../../../package.json').version
30+
let clientVersion = require('../../../package.json').version
31+
if (clientVersion.includes('-')) {
32+
clientVersion = clientVersion.slice(0, clientVersion.indexOf('-')) + 'p'
33+
}
3134
const nodeVersion = process.versions.node
3235

3336
const dataset = [

test/unit/helpers/scroll.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
const { test } = require('tap')
2323
const { Client, errors } = require('../../../')
2424
const { connection } = require('../../utils')
25-
const clientVersion = require('../../../package.json').version
25+
let clientVersion = require('../../../package.json').version
26+
if (clientVersion.includes('-')) {
27+
clientVersion = clientVersion.slice(0, clientVersion.indexOf('-')) + 'p'
28+
}
2629
const nodeVersion = process.versions.node
2730

2831
test('Scroll search', async t => {

0 commit comments

Comments
 (0)