Updates 8.13

.buildkite/pipeline.yml

@@ -5,7 +5,7 @@ steps:
  env:
  RUBY_VERSION: "{{ matrix.ruby }}"
  TEST_SUITE: "{{ matrix.suite }}"
- STACK_VERSION: 8.13.0-SNAPSHOT
+ STACK_VERSION: 8.13.5-SNAPSHOT
  TRANSPORT_VERSION: "{{ matrix.transport }}"
  RUBY_SOURCE: "{{ matrix.ruby_source }}"
  matrix:

.github/workflows/8.13.yml

@@ -26,7 +26,7 @@ jobs:
  sudo sysctl -w vm.max_map_count=262144
  - uses: elastic/elastic-github-actions/elasticsearch@master
  with:
- stack-version: 8.13.0-SNAPSHOT
+ stack-version: 8.13.5-SNAPSHOT
  security-enabled: false
  - uses: ruby/setup-ruby@v1
  with:
@@ -40,4 +40,4 @@ jobs:
  - name: elasticsearch
  run: cd elasticsearch && bundle exec rake test:all
  - name: elasticsearch-api
- run: rake elasticsearch:download_artifacts[8.13.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
+ run: rake elasticsearch:download_artifacts[8.13.5-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit

.github/workflows/otel.yml

@@ -28,7 +28,7 @@ jobs:
  sudo sysctl -w vm.max_map_count=262144
  - uses: elastic/elastic-github-actions/elasticsearch@master
  with:
- stack-version: 8.13.0-SNAPSHOT
+ stack-version: 8.13.5-SNAPSHOT
  security-enabled: false
  - uses: ruby/setup-ruby@v1
  with:
@@ -42,4 +42,4 @@ jobs:
  - name: elasticsearch
  run: cd elasticsearch && bundle exec rake test:all
  - name: elasticsearch-api
- run: rake elasticsearch:download_artifacts[8.13.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
+ run: rake elasticsearch:download_artifacts[8.13.5-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit

elasticsearch/spec/integration/characters_escaping_spec.rb

@@ -14,11 +14,11 @@
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
+require 'spec_helper'
+
 ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
 raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
 
-require 'spec_helper'
-
 context 'Elasticsearch client' do
  let(:client) do
  Elasticsearch::Client.new(host: ELASTICSEARCH_URL, user: 'elastic', password: 'changeme')

elasticsearch/spec/integration/client_integration_spec.rb

@@ -14,12 +14,12 @@
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
-raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
-
 require 'spec_helper'
 require 'logger'
 
+ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
 context 'Elasticsearch client' do
  let(:logger) { Logger.new($stderr) }
 

rake_tasks/elasticsearch_tasks.rake

@@ -43,8 +43,8 @@ namespace :elasticsearch do
 
  def download_file!(url, filename)
  puts "Downloading #{filename} from #{url}"
- File.open(filename, "w") do |downloaded_file|
- URI.open(url, "rb") do |artifact_file|
+ File.open(filename, 'w') do |downloaded_file|
+ URI.open(url, 'rb') do |artifact_file|
  downloaded_file.write(artifact_file.read)
  end
  end
@@ -54,8 +54,11 @@ namespace :elasticsearch do
  warn "[!] Couldn't download #{filename}"
  exit 1
  end
+ rescue OpenURI::HTTPError => e
+ abort e.message
  rescue StandardError => e
- abort e
+ puts e.backtrace.join("\n\t")
+ abort e.message
  end
 
  desc 'Download artifacts (tests and REST spec) for currently running cluster'