Skip to content

Commit 571053a

Browse files
Merge branch 'main' into add-product-frontmatter
2 parents bf5086f + 08c277e commit 571053a

File tree

6 files changed

+36
-4
lines changed

6 files changed

+36
-4
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ steps:
6969
- label: 'Destroy :elasticsearch: Serverless projects'
7070
depends_on:
7171
- step: run-serverless-tests
72-
allow_failure: true
72+
allow_failure: false
7373
agents:
7474
image: 'docker.elastic.co/appex-qa/qaf:latest'
7575
env:

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
ruby: ['head', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4', 'jruby-head']
17+
ruby: ['head', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4', 'jruby-10.0']
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4

docs/release-notes/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ To check for security updates, go to [Security announcements for the Elastic sta
2020
% ### Fixes [elasticsearch-ruby-client-next-fixes]
2121
% *
2222

23+
## 9.0.3 [elasticsearch-ruby-client-9.0.3-release-notes]
24+
25+
### Fixes [elasticsearch-ruby-client-9.0.3-fixes]
26+
27+
- Adds `ccr` alias for `cross_cluster_replication` and `slm` alias for `snapshot_lifecycle_management`.
28+
- Tested for JRuby 10.0.0.
29+
- General updates in source code docs.
30+
2331
## 9.0.2 [elasticsearch-ruby-client-9.0.2-release-notes]
2432

2533
### Fixes [elasticsearch-ruby-client-9.0.2-fixes]

elasticsearch-api/lib/elasticsearch/api.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ def perform_request(method, path, params = {}, body = nil, headers = nil, reques
110110

111111
alias ml machine_learning
112112
alias ilm index_lifecycle_management
113+
alias ccr cross_cluster_replication
114+
alias slm snapshot_lifecycle_management
113115

114116
# The serializer class
115117
#

elasticsearch-api/spec/unit/client_spec.rb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,26 @@
3939
expect(client.respond_to?(:bulk)).to be(true)
4040
end
4141
end
42+
43+
describe 'aliases' do
44+
it 'uses ml alias' do
45+
expect(client.machine_learning).to be_a MachineLearningClient
46+
expect(client.ml).to be_a MachineLearningClient
47+
end
48+
49+
it 'uses ilm alias' do
50+
expect(client.index_lifecycle_management).to be_a IndexLifecycleManagementClient
51+
expect(client.ilm).to be_a IndexLifecycleManagementClient
52+
end
53+
54+
it 'uses ccr alias' do
55+
expect(client.cross_cluster_replication).to be_a CrossClusterReplicationClient
56+
expect(client.ccr).to be_a CrossClusterReplicationClient
57+
end
58+
59+
it 'uses slm alias' do
60+
expect(client.snapshot_lifecycle_management).to be_a SnapshotLifecycleManagementClient
61+
expect(client.slm).to be_a SnapshotLifecycleManagementClient
62+
end
63+
end
4264
end

elasticsearch-api/spec/yaml-test-runner/run.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def serverless?
6363
options.merge!(
6464
{
6565
retry_on_status: [409, 400, 503],
66-
retry_on_failure: 10,
67-
delay_on_retry: 5_000,
66+
retry_on_failure: 30,
67+
delay_on_retry: 10_000,
6868
request_timeout: 120
6969
}
7070
)

0 commit comments

Comments
 (0)