Skip to content

Commit 0071f48

Browse files
authored
Merge branch 'main' into arrow-stream
2 parents 8b7bc18 + a7123f8 commit 0071f48

File tree

99 files changed

+2071
-483
lines changed

Some content is hidden

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

99 files changed

+2071
-483
lines changed

.github/workflows/nodejs.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
outputs:
1212
src-only: "${{ steps.changes.outputs.src-only }}"
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1515
with:
1616
persist-credentials: false
17-
- uses: dorny/paths-filter/@v3.0.2
17+
- uses: dorny/paths-filter/@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
1818
id: changes
1919
with:
2020
filters: |
@@ -36,12 +36,12 @@ jobs:
3636
os: [ubuntu-latest, windows-latest, macOS-latest]
3737

3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4040
with:
4141
persist-credentials: false
4242

4343
- name: Use Node.js ${{ matrix.node-version }}
44-
uses: actions/setup-node@v4
44+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
4545
with:
4646
node-version: ${{ matrix.node-version }}
4747

@@ -62,12 +62,12 @@ jobs:
6262
runs-on: ubuntu-latest
6363

6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
6666
with:
6767
persist-credentials: false
6868

6969
- name: Use Node.js
70-
uses: actions/setup-node@v4
70+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
7171
with:
7272
node-version: 22.x
7373

@@ -92,12 +92,12 @@ jobs:
9292
os: [ubuntu-latest, windows-latest, macOS-latest]
9393

9494
steps:
95-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
9696
with:
9797
persist-credentials: false
9898

9999
- name: Use Bun
100-
uses: oven-sh/setup-bun@v2
100+
uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2
101101

102102
- name: Install
103103
run: |

.github/workflows/npm-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
contents: write
1313
id-token: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1616
with:
1717
persist-credentials: false
1818
ref: ${{ github.event.inputs.branch }}
19-
- uses: actions/setup-node@v4
19+
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
2020
with:
2121
node-version: "22.x"
2222
registry-url: "https://registry.npmjs.org"

.github/workflows/serverless-patch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
)
2727
)
2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3030
with:
3131
persist-credentials: false
3232
repository: elastic/elasticsearch-js
3333
ref: main
3434
path: stack
3535
fetch-depth: 0
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3737
with:
3838
persist-credentials: false
3939
repository: elastic/elasticsearch-serverless-js
@@ -42,7 +42,7 @@ jobs:
4242
- name: Apply patch from stack to serverless
4343
id: apply-patch
4444
run: $GITHUB_WORKSPACE/stack/.github/workflows/serverless-patch.sh
45-
- uses: peter-evans/create-pull-request@v6
45+
- uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
4646
with:
4747
token: ${{ secrets.GH_TOKEN }}
4848
path: serverless

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
stale:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/stale@v8
11+
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8
1212
with:
1313
stale-issue-label: stale
1414
stale-pr-label: stale

docs/doc_examples/77113c65e1755313183a8969233a5a07.asciidoc renamed to docs/doc_examples/01ae196538fac197eedbbf458a4ef31b.asciidoc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
----
66
const response = await client.indices.create({
77
index: "idx",
8-
mappings: {
9-
_source: {
10-
mode: "synthetic",
8+
settings: {
9+
index: {
10+
mapping: {
11+
source: {
12+
mode: "synthetic",
13+
},
14+
},
1115
},
16+
},
17+
mappings: {
1218
properties: {
1319
kwd: {
1420
type: "keyword",

docs/doc_examples/611c1e05f4ebb48a1a8c8488238ce34d.asciidoc renamed to docs/doc_examples/0709a38613d2de90d418ce12b36af30e.asciidoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
[source, js]
55
----
6-
const response = await client.cluster.reroute({
7-
metric: "none",
8-
});
6+
const response = await client.cluster.reroute();
97
console.log(response);
108
----

docs/doc_examples/eed968e0d9fa2a4545c36a4e5f47b64b.asciidoc renamed to docs/doc_examples/0bee07a581c5776e068f6f4efad5a399.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const response = await client.esql.asyncQuery({
88
body: {
99
query:
1010
"\n FROM my-index-000001,cluster_one:my-index-000001,cluster_two:my-index*\n | STATS COUNT(http.response.status_code) BY user.id\n | LIMIT 2\n ",
11+
include_ccs_metadata: true,
1112
},
1213
});
1314
console.log(response);
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// This file is autogenerated, DO NOT EDIT
2+
// Use `node scripts/generate-docs-examples.js` to generate the docs examples
3+
4+
[source, js]
5+
----
6+
const response = await client.search({
7+
index: "cooking_blog",
8+
query: {
9+
match: {
10+
title: {
11+
query: "fluffy pancakes breakfast",
12+
minimum_should_match: 2,
13+
},
14+
},
15+
},
16+
});
17+
console.log(response);
18+
----

docs/doc_examples/ce13afc0c976c5e1f424b58e0c97fd64.asciidoc renamed to docs/doc_examples/0d30077cd34e93377a3a86f2ebd69415.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const response = await client.connector.put({
99
name: "My Connector",
1010
description: "My Connector to sync data to Elastic index from Google Drive",
1111
service_type: "google_drive",
12-
language: "english",
12+
language: "en",
1313
});
1414
console.log(response);
1515
----
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// This file is autogenerated, DO NOT EDIT
2+
// Use `node scripts/generate-docs-examples.js` to generate the docs examples
3+
4+
[source, js]
5+
----
6+
const response = await client.inference.put({
7+
task_type: "text_embedding",
8+
inference_id: "watsonx-embeddings",
9+
inference_config: {
10+
service: "watsonxai",
11+
service_settings: {
12+
api_key: "<api_key>",
13+
url: "<url>",
14+
model_id: "ibm/slate-30m-english-rtrvr",
15+
project_id: "<project_id>",
16+
api_version: "2024-03-14",
17+
},
18+
},
19+
});
20+
console.log(response);
21+
----

0 commit comments

Comments
 (0)