Skip to content

Commit 984d7e2

Browse files
committed
Update to latest codebase
2 parents 98fa198 + 26f23f2 commit 984d7e2

File tree

5,039 files changed

+533456
-655431
lines changed

Some content is hidden

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

5,039 files changed

+533456
-655431
lines changed

.buildkite/DockerFile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DOTNET_VERSION=8.0.400
1+
ARG DOTNET_VERSION=9.0.100
22
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
33

44
ENV NUGET_SCRATCH="/tmp/NuGetScratch"

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
env:
66
TEST_SUITE: "{{ matrix.suite }}"
77
STACK_VERSION: master-SNAPSHOT
8-
DOTNET_VERSION: 8.0.400
8+
DOTNET_VERSION: 9.0.100
99
matrix:
1010
setup:
1111
suite:

.buildkite/run-repository.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param(
1414
$NODE_NAME,
1515

1616
[string]
17-
$DOTNET_VERSION = "8.0.400"
17+
$DOTNET_VERSION = "9.0.100"
1818
)
1919

2020
$ESC = [char]27

.buildkite/run-repository.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
99
source $script_path/functions/imports.sh
1010
set -euo pipefail
1111

12-
DOTNET_VERSION=${DOTNET_VERSION-8.0.400}
12+
DOTNET_VERSION=${DOTNET_VERSION-9.0.100}
1313
ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
1414
elasticsearch_container=${elasticsearch_container-}
1515

.buildkite/run-tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param (
88
$TEST_SUITE = "free",
99

1010
[string]
11-
$DOTNET_VERSION = "8.0.400"
11+
$DOTNET_VERSION = "9.0.100"
1212
)
1313

1414
$ESC = [char]27

.ci/DockerFile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DOTNET_VERSION=8.0.400
1+
ARG DOTNET_VERSION=9.0.100
22
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
33

44
ENV NUGET_SCRATCH="/tmp/NuGetScratch"

.ci/make.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ OUTPUT_DIR="$repo/${output_folder}"
4242
REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
4343
mkdir -p "$OUTPUT_DIR"
4444

45-
DOTNET_VERSION=${DOTNET_VERSION-8.0.400}
45+
DOTNET_VERSION=${DOTNET_VERSION-9.0.100}
4646

4747
echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
4848
echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"

.ci/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $ STACK_VERSION=8.0.0-SNAPSHOT ./.ci/run-tests
3030
|-------------------------|-------------|-------------|
3131
| `STACK_VERSION` | `N/A` | The elasticsearch version to target
3232
| `TEST_SUITE` | `basic` | `free` or `platinum` sets which test suite to run and which container to run against. |
33-
| `DOTNET_VERSION` | `8.0.400` | The .NET sdk version used to grab the proper container |
33+
| `DOTNET_VERSION` | `9.0.100` | The .NET sdk version used to grab the proper container |
3434

3535
If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use
3636

.ci/run-repository.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param(
1414
$NODE_NAME,
1515

1616
[string]
17-
$DOTNET_VERSION = "8.0.400"
17+
$DOTNET_VERSION = "9.0.100"
1818
)
1919

2020
$ESC = [char]27

.ci/run-repository.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
99
source $script_path/functions/imports.sh
1010
set -euo pipefail
1111

12-
DOTNET_VERSION=${DOTNET_VERSION-8.0.400}
12+
DOTNET_VERSION=${DOTNET_VERSION-9.0.100}
1313
ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
1414
elasticsearch_container=${elasticsearch_container-}
1515

.ci/run-tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param (
88
$TEST_SUITE = "free",
99

1010
[string]
11-
$DOTNET_VERSION = "8.0.400"
11+
$DOTNET_VERSION = "9.0.100"
1212
)
1313

1414
$ESC = [char]27

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ TEST_SUITE:
88
- platinum
99

1010
DOTNET_VERSION:
11-
- 8.0.400
11+
- 9.0.100
1212

1313
exclude: ~
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report for version 9.x
3+
about: File a bug report for Elastic.Clients.Elasticsearch version 9.x
4+
title: ''
5+
labels:
6+
- 'Category: Bug'
7+
- '9.x'
8+
assignees: ''
9+
10+
---
11+
12+
**Elastic.Clients.Elasticsearch version**:
13+
14+
**Elasticsearch version**:
15+
16+
**.NET runtime version**:
17+
18+
**Operating system version**:
19+
20+
**Description of the problem including expected versus actual behavior**:
21+
A clear and concise description of what the bug is.
22+
23+
**Steps to reproduce**:
24+
1.
25+
2.
26+
3.
27+
28+
**Expected behavior**
29+
A clear and concise description of what you expected to happen.
30+
31+
**Provide `ConnectionSettings` (if relevant)**:
32+
33+
**Provide `DebugInformation` (if relevant)**:
File renamed without changes.
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
name: Check
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
types: [labeled, unlabeled, opened, reopened, synchronize]
8+
9+
permissions:
10+
pull-requests: "read"
11+
12+
jobs:
13+
check-backport-label:
14+
name: backport label
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: "Check backport label"
19+
env:
20+
GH_TOKEN: ${{ github.token }}
21+
run: |
22+
json_pr_labels='${{ toJSON(github.event.pull_request.labels) }}'
23+
readarray -t pr_labels < <(echo "${json_pr_labels}" | jq -r -c '.[].name')
24+
25+
json_all_labels="$(gh label list --repo ${{ github.repository }} --json name --search "backport" --limit 1000)"
26+
readarray -t all_labels < <(echo "${json_all_labels}" | jq -r -c '.[].name')
27+
28+
declare -A all_backport_labels=()
29+
declare -A all_floating_majors=()
30+
31+
backport_regex="^backport ([0-9])+\.([0-9]+|x)$"
32+
33+
echo "::group::Available Labels"
34+
echo "skip-backport"
35+
36+
for label in "${all_labels[@]}"; do
37+
if [[ "${label}" =~ ${backport_regex} ]]; then
38+
major="${BASH_REMATCH[1]}"
39+
minor="${BASH_REMATCH[2]}"
40+
all_backport_labels["${label}"]=1
41+
echo "${label}"
42+
43+
if [ "${minor}" = "x" ]; then
44+
all_floating_majors["${major}"]=1
45+
fi
46+
fi
47+
done
48+
49+
echo "::endgroup::"
50+
51+
has_exact_backport_label=false
52+
declare -A pr_exact_majors=()
53+
declare -A pr_floating_majors=()
54+
55+
echo "::group::Detected Labels"
56+
57+
for pr_label in "${pr_labels[@]}"; do
58+
if [ "${pr_label}" = "skip-backport" ]; then
59+
has_exact_backport_label=true
60+
echo "${pr_label}"
61+
continue
62+
fi
63+
64+
if [ -z "${all_backport_labels[${pr_label}]}" ]; then
65+
continue
66+
fi
67+
68+
if [[ "${pr_label}" =~ ${backport_regex} ]]; then
69+
major="${BASH_REMATCH[1]}"
70+
minor="${BASH_REMATCH[2]}"
71+
if [ "${minor}" != "x" ]; then
72+
pr_exact_majors["${major}"]=1
73+
has_exact_backport_label=true
74+
else
75+
pr_floating_majors["${major}"]=1
76+
fi
77+
fi
78+
79+
echo "${pr_label}"
80+
done
81+
82+
echo "::endgroup::"
83+
84+
if [ "${has_exact_backport_label}" != true ]; then
85+
echo "::error::No exact backport label found. Please add at least one of the"\
86+
"'backport {major}.{minor}' labels or use 'skip-backport',"\
87+
"if this PR should not be backported."
88+
exit 1
89+
fi
90+
91+
# Validate that a floating backport label exists for each exact backport label major
92+
# version.
93+
94+
has_required_floating_labels=true
95+
96+
for pr_major in "${!pr_exact_majors[@]}"; do
97+
if [ -z "${all_floating_majors[${pr_major}]}" ]; then
98+
# There is no floating version branch for the given major version.
99+
continue
100+
fi
101+
102+
if [ -z "${pr_floating_majors[${pr_major}]}" ]; then
103+
has_required_floating_labels=false
104+
echo "::error::Missing floating backport label for '${pr_major}.x'"
105+
fi
106+
done
107+
108+
if [ "${has_required_floating_labels}" != true ]; then
109+
exit 1
110+
fi
111+
112+
# Validate that an exact backport label exists for each floating backport label major
113+
# version.
114+
115+
has_required_exact_labels=true
116+
117+
for pr_floating_major in "${!pr_floating_majors[@]}"; do
118+
if [ -z "${pr_exact_majors[${pr_floating_major}]}" ]; then
119+
has_required_exact_labels=false
120+
echo "::error::Missing exact backport label for '${pr_floating_major}.x'"
121+
fi
122+
done
123+
124+
if [ "${has_required_exact_labels}" != true ]; then
125+
exit 1
126+
fi

.github/workflows/docfx.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: 'CD'
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
target_branch:
7+
description: 'The target branch to which the documentation should be pushed to.'
8+
type: 'string'
9+
required: true
10+
name:
11+
description: 'The name to use for the documentation folder (defaults to the name of the current ref)'
12+
type: 'string'
13+
required: false
14+
default: ${{ github.ref_name }}
15+
16+
concurrency:
17+
group: 'docfx'
18+
cancel-in-progress: false
19+
20+
env:
21+
# Configuration
22+
GLOBAL_JSON_FILE: 'global.json'
23+
CACHE_PATTERNS: '["**/*.[cf]sproj*", "**/*.Build.props"]'
24+
# .NET SDK related environment variables
25+
DOTNET_NOLOGO: 1
26+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
27+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
28+
DOTNET_GENERATE_ASPNET_CERTIFICATE: 0
29+
30+
jobs:
31+
docfx:
32+
name: 'DocFx'
33+
runs-on: 'ubuntu-latest'
34+
steps:
35+
- name: 'Checkout'
36+
uses: 'actions/checkout@v4'
37+
38+
- name: '.NET Setup'
39+
uses: 'actions/setup-dotnet@v4'
40+
with:
41+
global-json-file: '${{ github.workspace }}/${{ env.GLOBAL_JSON_FILE }}'
42+
43+
- name: 'DocFX Setup'
44+
run: |-
45+
dotnet tool update -g docfx
46+
47+
# TODO: Remove 'stack'
48+
- name: '.NET Cache Packages'
49+
uses: 'actions/cache@v4'
50+
with:
51+
path: '~/.nuget/packages'
52+
key: '${{ runner.os }}-nuget-stack-${{ hashFiles(fromJson(env.CACHE_PATTERNS)) }}'
53+
restore-keys: '${{ runner.os }}-nuget-stack-'
54+
55+
- name: 'DocFx Build'
56+
working-directory: 'docfx'
57+
run: |-
58+
docfx docfx.json
59+
mv ./_site ./../..
60+
61+
- name: 'Checkout'
62+
uses: 'actions/checkout@v4'
63+
with:
64+
ref: ${{ inputs.target_branch }}
65+
66+
- name: 'Commit'
67+
run: |-
68+
rm -r "./${{ inputs.name }}" || true
69+
mv ../_site "./${{ inputs.name }}"
70+
git config --global user.name '${{ github.actor }}'
71+
git config --global user.email '${{ github.actor }}@users.noreply.github.com'
72+
git add -A
73+
git commit -am "Add ${{ inputs.name }}"
74+
git push

.github/workflows/docfx_manual.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: 'DocFx'
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
docfx:
8+
name: 'DocFx'
9+
uses: ./.github/workflows/docfx.yml
10+
with:
11+
target_branch: 'refdoc'
12+
secrets: 'inherit'

.github/workflows/docs-build.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: docs-build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request_target: ~
8+
merge_group: ~
9+
10+
jobs:
11+
docs-preview:
12+
uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
13+
with:
14+
path-pattern: docs/**
15+
permissions:
16+
deployments: write
17+
id-token: write
18+
contents: read
19+
pull-requests: read

.github/workflows/docs-cleanup.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: docs-cleanup
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- closed
7+
8+
jobs:
9+
docs-preview:
10+
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
11+
permissions:
12+
contents: none
13+
id-token: write
14+
deployments: write

.github/workflows/release_stack.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,12 @@ jobs:
1616
release_tag: ${{ github.event.release.tag_name }}
1717
release_body: ${{ github.event.release.body }}
1818
secrets: 'inherit'
19+
20+
docfx:
21+
name: 'DocFx'
22+
if: ${{ !startsWith(github.event.release.tag_name, 'serverless-') }}
23+
uses: ./.github/workflows/docfx.yml
24+
with:
25+
name: ${{ github.event.release.tag_name }}
26+
target_branch: 'refdoc'
27+
secrets: 'inherit'

0 commit comments

Comments
 (0)