From 4f9408ae1ec09278a51e27e4e7929569768b1afb Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Mon, 28 Oct 2024 09:31:16 +0000 Subject: [PATCH 1/5] Bumps version to 8.17 --- elasticsearch-api/lib/elasticsearch/api/version.rb | 2 +- elasticsearch/elasticsearch.gemspec | 2 +- elasticsearch/lib/elasticsearch/version.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/elasticsearch-api/lib/elasticsearch/api/version.rb b/elasticsearch-api/lib/elasticsearch/api/version.rb index 512a230f53..b79e9aeb19 100644 --- a/elasticsearch-api/lib/elasticsearch/api/version.rb +++ b/elasticsearch-api/lib/elasticsearch/api/version.rb @@ -17,6 +17,6 @@ module Elasticsearch module API - VERSION = '8.16.0'.freeze + VERSION = '8.17.0'.freeze end end diff --git a/elasticsearch/elasticsearch.gemspec b/elasticsearch/elasticsearch.gemspec index b1f6cfedd8..01fa96b12d 100644 --- a/elasticsearch/elasticsearch.gemspec +++ b/elasticsearch/elasticsearch.gemspec @@ -46,7 +46,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.5' s.add_dependency 'elastic-transport', '~> 8.3' - s.add_dependency 'elasticsearch-api', '8.16.0' + s.add_dependency 'elasticsearch-api', '8.17.0' s.add_development_dependency 'base64' s.add_development_dependency 'bundler' diff --git a/elasticsearch/lib/elasticsearch/version.rb b/elasticsearch/lib/elasticsearch/version.rb index 94d7036911..822eadc59b 100644 --- a/elasticsearch/lib/elasticsearch/version.rb +++ b/elasticsearch/lib/elasticsearch/version.rb @@ -16,5 +16,5 @@ # under the License. module Elasticsearch - VERSION = '8.16.0'.freeze + VERSION = '8.17.0'.freeze end From d64a9270551b0f155a5c73189c259764632b3829 Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Mon, 28 Oct 2024 09:39:05 +0000 Subject: [PATCH 2/5] [CI] Bumps STACK_VERSION to 8.17.0-SNAPSHOT --- .buildkite/pipeline.yml | 6 +++--- .github/workflows/8.x.yml | 4 ++-- .github/workflows/otel.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index fb64720c28..a8481eb6f6 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -5,7 +5,7 @@ steps: env: RUBY_VERSION: "{{ matrix.ruby }}" TEST_SUITE: "{{ matrix.suite }}" - STACK_VERSION: 8.16.0-SNAPSHOT + STACK_VERSION: 8.17.0-SNAPSHOT TRANSPORT_VERSION: "{{ matrix.transport }}" RUBY_SOURCE: "{{ matrix.ruby_source }}" QUIET: false @@ -67,8 +67,8 @@ steps: provider: "gcp" env: RUBY_VERSION: "3.3" - STACK_VERSION: 8.16.0-SNAPSHOT - ES_YAML_TESTS_BRANCH: main + STACK_VERSION: 8.17.0-SNAPSHOT + ES_YAML_TESTS_BRANCH: 8.x TRANSPORT_VERSION: "8.3" RUBY_SOURCE: "ruby" TEST_SUITE: "platinum" diff --git a/.github/workflows/8.x.yml b/.github/workflows/8.x.yml index 52b2e67a2e..c4bee2e0fa 100644 --- a/.github/workflows/8.x.yml +++ b/.github/workflows/8.x.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.16.0-SNAPSHOT + stack-version: 8.17.0-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 es:download_artifacts[8.16.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit + run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit diff --git a/.github/workflows/otel.yml b/.github/workflows/otel.yml index 56d6b9a5fc..95158d19b2 100644 --- a/.github/workflows/otel.yml +++ b/.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.16.0-SNAPSHOT + stack-version: 8.17.0-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 es:download_artifacts[8.16.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit + run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit From 459a8f51fd87483acdcae60f4e668ac46374c2ee Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Mon, 28 Oct 2024 09:40:09 +0000 Subject: [PATCH 3/5] [CI] Updates automation for bumping stack_version in test matrices --- rake_tasks/automation.rake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rake_tasks/automation.rake b/rake_tasks/automation.rake index 6edce27267..751804e492 100644 --- a/rake_tasks/automation.rake +++ b/rake_tasks/automation.rake @@ -98,7 +98,6 @@ namespace :automation do task :bumpmatrix, :version do |_, args| abort('[!] Required argument [version] missing') unless (version = args[:version]) gh_actions = Dir.glob(File.expand_path('../.github/workflows/*.yml', __dir__)) - files = gh_actions + ['.buildkite/pipeline.yml'] regexp = Regexp.new(/([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}?+(-SNAPSHOT)?)/) files.each do |file| @@ -108,10 +107,10 @@ namespace :automation do yaml = YAML.safe_load(content) branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1] yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH'] - next if yaml_tests_branch == 'main' - - content.gsub!(yaml_tests_branch, branch) - puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}" + unless ['main', '8.x'].include? yaml_tests_branch + content.gsub!(yaml_tests_branch, branch) + puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}" + end end match = content.match(regexp) next if match.nil? From b79d964f0c56a14ecc3f2f83f76e48de664f0bf5 Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Tue, 22 Oct 2024 17:29:47 +0100 Subject: [PATCH 4/5] Minor updates to test runner --- .../api-spec-testing/rspec_matchers.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/elasticsearch-api/api-spec-testing/rspec_matchers.rb b/elasticsearch-api/api-spec-testing/rspec_matchers.rb index 410102af0e..cb8db34b5d 100644 --- a/elasticsearch-api/api-spec-testing/rspec_matchers.rb +++ b/elasticsearch-api/api-spec-testing/rspec_matchers.rb @@ -174,7 +174,7 @@ failure_message do |response| "the expected response pair/value(s) #{@mismatched_pairs}" + - " does not match the pair/value(s) in the response #{response}" + " does not match the pair/value(s) in the response #{response}" end def sanitize_pairs(expected_pairs) @@ -235,8 +235,14 @@ def compare_hash(expected_pairs, actual_hash, test) when Hash compare_hash(expected_value, actual_value, test) when Array - unless compare_array(expected_value, actual_value, test, actual_hash) - @mismatched_pairs.merge!(expected_key => expected_value) + begin + unless compare_array(expected_value.sort, actual_value.sort, test, actual_hash) + @mismatched_pairs.merge!(expected_key => expected_value) + end + rescue TypeError, ArgumentError + unless compare_array(expected_value, actual_value, test, actual_hash) + @mismatched_pairs.merge!(expected_key => expected_value) + end end when String unless compare_string(expected_value, actual_value, test, actual_hash) @@ -283,6 +289,8 @@ def compare_array(expected, actual, test, response) return false unless compare_array(value, actual[i], test, response) when String return false unless compare_string(value, actual[i], test, response) + else + true end end end From 39585496567a57aed0901b9166679da4e66a349e Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Mon, 28 Oct 2024 14:01:31 +0000 Subject: [PATCH 5/5] Updates skipped tests free --- .../spec/rest_api/skipped_tests_free.yml | 51 +++++++++++++++++++ .../spec/rest_api/skipped_tests_platinum.yml | 3 ++ 2 files changed, 54 insertions(+) diff --git a/elasticsearch-api/spec/rest_api/skipped_tests_free.yml b/elasticsearch-api/spec/rest_api/skipped_tests_free.yml index fa53c4d4d6..82787b7bb6 100644 --- a/elasticsearch-api/spec/rest_api/skipped_tests_free.yml +++ b/elasticsearch-api/spec/rest_api/skipped_tests_free.yml @@ -162,3 +162,54 @@ - :file: 'ingest_geoip/60_ip_location_databases.yml' :description: '*' +- + :file: 'index/91_metrics_no_subobjects.yml' + :description: 'Metrics object indexing with synthetic source' +- + :file: 'indices.create/20_synthetic_source.yml' + :description: '*' +- + :file: 'indices.create/21_synthetic_source_stored.yml' + :description: '*' +- + :file: 'indices.put_mapping/10_basic.yml' + :description: 'disabling synthetic source fails' +- + :file: 'logsdb/20_source_mapping.yml' + :description: 'synthetic _source is default' +- + :file: 'index/92_metrics_auto_subobjects.yml' + :description: 'Metrics object indexing with synthetic source' +- + :file: 'tsdb/20_mapping.yml' + :description: 'Synthetic source' +- + :file: 'search.highlight/50_synthetic_source.yml' + :description: 'text multi fvh source order' +- + :file: 'search.highlight/50_synthetic_source.yml' + :description: 'text multi fvh score order' +- + :file: 'update/100_synthetic_source.yml' + :description: 'stored text' +- + :file: 'get/100_synthetic_source.yml' + :description: 'fetch without refresh also produces synthetic source' +- + :file: 'update/100_synthetic_source.yml' + :description: 'stored text' +- + :file: 'update/100_synthetic_source.yml' + :description: 'keyword' +- + :file: 'update/100_synthetic_source.yml' + :description: 'fetch without refresh also produces synthetic source' +- + :file: 'get/100_synthetic_source.yml' + :description: 'flattened field' +- + :file: 'get/100_synthetic_source.yml' + :description: 'flattened field with ignore_above and arrays' +- + :file: 'range/20_synthetic_source.yml' + :description: '*' diff --git a/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml b/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml index 2515cf38ae..d335b89d29 100644 --- a/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml +++ b/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml @@ -214,3 +214,6 @@ - :file: 'esql/180_match_operator.yml' :description: '*' +- + :file: 'esql/60_usage.yml' + :description: 'Basic ESQL usage output (telemetry) non-snapshot version'