Skip to content

Commit 8c78f47

Browse files
authored
Support for Elasticsearch 7.3 (#928)
1 parent 823c209 commit 8c78f47

File tree

330 files changed

+3956
-6268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+3956
-6268
lines changed

.ci/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
- elasticsearch-oss
2323

2424
elasticsearch-oss:
25-
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1}
25+
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.0.0-SNAPSHOT}
2626
volumes:
2727
- esvol:/tmp
2828
networks:
@@ -58,7 +58,7 @@ services:
5858
command: ["npm", "run", "test:integration"]
5959

6060
elasticsearch-platinum:
61-
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-beta1}
61+
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.0.0-SNAPSHOT}
6262
ports:
6363
- "9200:9200"
6464
networks:
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
- job:
3+
name: elastic+elasticsearch-js+7.3
4+
display-name: 'elastic / elasticsearch-js # 7.3'
5+
description: Testing the elasticsearch-js 7.3 branch.
6+
parameters:
7+
- string:
8+
name: branch_specifier
9+
default: refs/heads/7.3
10+
description: the Git branch specifier to build (<branchName>, <tagName>,
11+
<commitId>, etc.)
12+
triggers:
13+
- github
14+
- timed: '@weekly'
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
- job:
3+
name: elastic+elasticsearch-js+jenkins-pipelines
4+
display-name: 'elastic / elasticsearch-js # jenkins-pipelines'
5+
description: Testing the elasticsearch-js jenkins-pipelines branch.
6+
project-type: multibranch
7+
logrotate:
8+
daysToKeep: 30
9+
numToKeep: 100
10+
number-to-keep: '5'
11+
days-to-keep: '1'
12+
concurrent: true
13+
node: linux
14+
script-path: Jenkinsfile
15+
scm:
16+
- github:
17+
branch-discovery: all
18+
discover-pr-forks-strategy: merge-current
19+
discover-pr-forks-trust: permission
20+
discover-pr-origin: merge-current
21+
discover-tags: true
22+
repo: elasticsearch-js
23+
repo-owner: elastic
24+
credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
25+
ssh-checkout:
26+
credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
27+
build-strategies:
28+
- tags:
29+
ignore-tags-older-than: -1
30+
ignore-tags-newer-than: -1
31+
- regular-branches: true
32+
- change-request:
33+
ignore-target-only-changes: false
34+
clean:
35+
after: true
36+
before: true
37+
prune: true
38+
shallow-clone: true
39+
depth: 3
40+
do-not-fetch-tags: true
41+
submodule:
42+
disable: false
43+
recursive: true
44+
parent-credentials: true
45+
timeout: 100
46+
timeout: '15'
47+
use-author: true
48+
wipe-workspace: 'True'
49+
periodic-folder-trigger: 1d
50+
prune-dead-branches: true
51+
publishers:
52+
- email:
53+
recipients: infra-root+build@elastic.co
54+

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
ELASTICSEARCH_VERSION:
3-
- 7.2.0
3+
- 7.3.0
44

55
NODE_JS_VERSION:
66
- 12

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#### You have already researched for similar issues?
44
It's not uncommon that somebody already opened an issue or in the best case it's already fixed but not merged. That's the reason why you should [search](https://github.com/elastic/elasticsearch-js/issues) at first before submitting a new one.
55

6-
#### Are you sure this is an issue with @elastic/elasticsearch or are you just looking for some help?
6+
#### Are you sure this is an issue with `@elastic/elasticsearch` or are you just looking for some help?
77

88
Issues should only be posted in this repository after you have been able to reproduce them and confirm that they are a bug or incorrect/missing information in the [docs](https://github.com/elastic/elasticsearch-js/docs).
99

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ Paste your code here:
2323

2424
```
2525

26+
<!--
27+
In some cases, it might be challenging to reproduce the bug in a few lines of code.
28+
You can fork the following repository, which contains all the configuration needed
29+
to spin up a three nodes Elasticsearch cluster with security enabled.
30+
The repository also contains a preconfigured client instance that you can use to reproduce the issue.
31+
https://github.com/delvedor/es-reproduce-issue
32+
--->
33+
2634
## Expected behavior
2735

2836
A clear and concise description of what you expected to happen.
@@ -36,6 +44,6 @@ Paste the results here:
3644
## Your Environment
3745

3846
- *node version*: 6,8,10
39-
- *@elastic/elasticsearch version*: >=7.0.0
47+
- `@elastic/elasticsearch` *version*: >=7.0.0
4048
- *os*: Mac, Windows, Linux
4149
- *any other relevant information*

.github/ISSUE_TEMPLATE/regression.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ Paste your code here:
2929

3030
```
3131

32+
<!--
33+
In some cases, it might be challenging to reproduce the bug in a few lines of code.
34+
You can fork the following repository, which contains all the configuration needed
35+
to spin up a three nodes Elasticsearch cluster with security enabled.
36+
The repository also contains a preconfigured client instance that you can use to reproduce the issue.
37+
https://github.com/delvedor/es-reproduce-issue
38+
--->
39+
3240
## Expected behavior
3341

3442
A clear and concise description of what you expected to happen.
@@ -42,6 +50,6 @@ Paste the results here:
4250
## Your Environment
4351

4452
- *node version*: 6,8,10
45-
- *@elastic/elasticsearch version*: >=7.0.0
53+
- `@elastic/elasticsearch` *version*: >=7.0.0
4654
- *os*: Mac, Windows, Linux
4755
- *any other relevant information*

.github/stale.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ exemptLabels:
99
- "discussion"
1010
- "feature request"
1111
- "bug"
12+
- "todo"
1213

1314
# Label to use when marking an issue as stale
1415
staleLabel: stale

api/api/bulk.js

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
1-
/*
2-
* Licensed to Elasticsearch B.V. under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch B.V. licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
1+
// Licensed to Elasticsearch B.V under one or more agreements.
2+
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information
194

205
'use strict'
216

api/api/cat.aliases.js

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
1-
/*
2-
* Licensed to Elasticsearch B.V. under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch B.V. licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
1+
// Licensed to Elasticsearch B.V under one or more agreements.
2+
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information
194

205
'use strict'
216

0 commit comments

Comments
 (0)