Skip to content

Commit c43d22d

Browse files
committed
Merge remote-tracking branch 'origin/main' into kibana-endpoint
2 parents eee49ce + 5784369 commit c43d22d

File tree

1,556 files changed

+247437
-113688
lines changed

Some content is hidden

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

1,556 files changed

+247437
-113688
lines changed

.backportrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"repoOwner": "elastic",
3+
"repoName": "elasticsearch-specification",
4+
"targetBranchChoices": ["9.0", "8.19", "8.18", "8.17"],
5+
"fork": false
6+
}

.buildkite/kibana.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ set -euo pipefail
55
# Since we're into the current repo, move to the top-level
66
cd ..
77

8+
echo "--- Install dependencies"
9+
lsb_release -a
10+
apt-get update -y
11+
apt-get install -y unzip
12+
813
echo "--- Clone elasticsearch-js"
914
git clone -v -- [email protected]:elastic/elasticsearch-js.git
10-
pushd elasticsearch-js
11-
git checkout $BUILDKITE_BRANCH
12-
popd
15+
16+
echo "--- Clone elastic-client-generator-js"
17+
git clone -v -- [email protected]:elastic/elastic-client-generator-js.git
18+
mkdir elastic-client-generator-js/output
1319

1420
echo "--- Clone Kibana"
1521
git clone -v --reference /usr/local/git-references/git-github-com-elastic-kibana-git -- [email protected]:elastic/kibana.git
16-
cd kibana
22+
pushd kibana
1723

1824
echo "--- Install Node.js and Yarn"
1925
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
@@ -25,13 +31,17 @@ set -e
2531
nvm install
2632
nvm use
2733
npm install --global yarn
34+
popd
2835

2936
echo "--- Install elasticsearch-js"
30-
pushd ../elasticsearch-js
37+
pushd elasticsearch-js
3138
npm install
39+
node .buildkite/make.mjs --task codegen main
3240
npm run build
3341
npm pack
3442
popd
43+
44+
pushd kibana
3545
yarn add ../elasticsearch-js/elastic-elasticsearch-*.tgz
3646

3747
echo "--- Bootstrap Kibana"

.buildkite/kibana.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ agents:
33
cpu: "4"
44
ephemeralStorage: 15Gi
55

6-
76
steps:
87
- label: "Run Kibana type checks"
98
command: .buildkite/kibana.sh

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,5 +234,6 @@ dist/* binary
234234

235235
output/** linguist-generated=true
236236
output/schema/validation-errors.json linguist-generated=false
237+
compiler-rs/compiler-wasm-lib/pkg/* linguist-generated=true
237238

238239
####################################################################################################

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
<!--
2-
3-
Hello there!
4-
5-
Thank you for opening a pull request!
6-
Please make sure to follow the steps below when opening a pr:
7-
8-
- Sign the CLA https://www.elastic.co/contributor-agreement/
9-
- Tag the relative issue (if any) and give a brief explanation on what your changes are doing
10-
- If you did a spec change, remember to generate again the outputs, you can do it by running `make contrib`
11-
- Add the appropriate backport labels. If you need to backport a breaking change (e.g. changing the structure of a type or changing the type/optionality of a field), please follow these rules:
12-
- If the API is unusable without the change -> every supported version
13-
- If the API is usable, but fix is on the response side -> every supported version
14-
- If the API is usable, but fix is on the request side -> no backport, unless the API is _partially_ usable and the fix unlocks a missing feature that has no workaround
15-
16-
Happy coding!
17-
18-
-->
1+
<!-- Hello there! Thank you for opening a pull request. See CONTRIBUTING.md for instructions. -->

.github/download-artifacts/index.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
* under the License.
1818
*/
1919

20-
'use strict'
21-
22-
const core = require('@actions/core')
23-
const { join } = require('path')
24-
const minimist = require('minimist')
25-
const stream = require('stream')
26-
const { promisify } = require('util')
27-
const { createWriteStream, promises } = require('fs')
28-
const rimraf = require('rimraf')
29-
const fetch = require('node-fetch')
30-
const crossZip = require('cross-zip')
20+
import core from '@actions/core'
21+
import { join, dirname } from 'path'
22+
import { fileURLToPath } from 'url'
23+
import minimist from 'minimist'
24+
import stream from 'stream'
25+
import { promisify } from 'util'
26+
import { createWriteStream, promises } from 'fs'
27+
import { rimraf } from 'rimraf'
28+
import fetch from 'node-fetch'
29+
import crossZip from 'cross-zip'
3130

3231
const { mkdir, rename, readdir, unlink } = promises
3332
const pipeline = promisify(stream.pipeline)
3433
const unzip = promisify(crossZip.unzip)
35-
const rm = promisify(rimraf)
3634

35+
const __filename = fileURLToPath(import.meta.url)
36+
const __dirname = dirname(__filename)
3737
const esFolder = join(__dirname, '..', '..', 'artifacts')
3838
const zipFolder = join(esFolder, 'artifacts.zip')
3939
const downloadedSpec = join(esFolder, 'rest-api-spec', 'api')
@@ -57,8 +57,8 @@ async function downloadArtifacts (opts) {
5757
core.info(`Resolved artifact URL for ${resolved.commit_url}`)
5858

5959
core.info('Cleanup')
60-
await rm(esFolder)
61-
await rm(specFolder)
60+
await rimraf(esFolder)
61+
await rimraf(specFolder)
6262
await mkdir(esFolder, { recursive: true })
6363
await mkdir(specFolder, { recursive: true })
6464

@@ -74,7 +74,7 @@ async function downloadArtifacts (opts) {
7474
await unzip(zipFolder, esFolder)
7575

7676
core.info('Cleanup')
77-
await rm(zipFolder)
77+
await rimraf(zipFolder)
7878

7979
core.info('Moving files')
8080
const files = await readdir(downloadedSpec)

.github/download-artifacts/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "download-artifacts",
33
"version": "1.0.0",
44
"description": "",
5+
"type": "module",
56
"main": "index.js",
67
"scripts": {
78
"test": "echo \"Error: no test specified\" && exit 1"
@@ -13,7 +14,7 @@
1314
"@actions/core": "^1.6.0",
1415
"cross-zip": "^4.0.0",
1516
"minimist": "^1.2.5",
16-
"node-fetch": "^2.6.7",
17-
"rimraf": "^3.0.2"
17+
"node-fetch": "^3",
18+
"rimraf": "^6"
1819
}
1920
}

.github/validate-pr/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import assert from 'assert'
2626
import * as core from '@actions/core'
2727
import { copyFile } from 'fs/promises'
2828
import * as github from '@actions/github'
29-
import specification from '../../output/schema/schema.json' assert { type: 'json' }
29+
import specification from '../../output/schema/schema.json' with { type: 'json' }
3030
import { run as getReport } from '../../../clients-flight-recorder/scripts/types-validator/index.js'
3131
import {
3232
getNamespace,
@@ -90,7 +90,12 @@ async function run() {
9090
if (file.startsWith('specification/_spec_utils')) continue
9191
if (file.startsWith('specification/_doc_ids')) continue
9292
if (file.startsWith('specification/_json_spec')) continue
93-
if (file === 'specification/tsconfig.json') continue
93+
if (file.startsWith('specification/node_modules')) continue
94+
if (file.endsWith('tsconfig.json')) continue
95+
if (file.endsWith('eslint.config.js')) continue
96+
if (file.endsWith('package.json')) continue
97+
if (file.endsWith('package-lock.json')) continue
98+
if (file.endsWith('.md')) continue
9499
if (getApi(file).endsWith('_types')) {
95100
const apis = specification.endpoints
96101
.filter(endpoint => endpoint.name.split('.').filter(s => !privateNames.includes(s))[0] === getApi(file).split('.')[0])

.github/validate-pr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"dependencies": {
1414
"@actions/core": "^1.6.0",
1515
"@actions/github": "^5.0.0",
16-
"zx": "^4.3.0"
16+
"zx": "^8"
1717
}
1818
}

.github/workflows/code-format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v4
1212

13-
- name: Use Node.js 20
13+
- name: Use Node.js 22
1414
uses: actions/setup-node@v4
1515
with:
16-
node-version: 20
16+
node-version: 22
1717

1818
- name: Install
1919
run: |

0 commit comments

Comments
 (0)