Skip to content

Bump elasticsearch-rails to 7.2.1 for import fix (but blocks using opensearch) #3299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
martinemde wants to merge 3 commits into from
Closed

Bump elasticsearch-rails to 7.2.1 for import fix (but blocks using opensearch) #3299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
374368d
Bump elasticsearch related gems to 7.17 and 7.2.1 for compatibility.
martinemde Dec 15, 2022
a868d77
Lock elasticsearch to before forced version verification
martinemde Dec 27, 2022
fa638d2
Revert "Lock elasticsearch to before forced version verification"
martinemde Dec 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@ gem "shoryuken", "~> 4.0", require: false
gem "statsd-instrument", "~> 2.3.0"
gem "unicorn", "~> 5.8.0"
gem "validates_formatting_of"
gem "elasticsearch", "~> 7.10.1"
gem "elasticsearch-api", "~> 7.10.1"
gem "elasticsearch-transport", "~> 7.10.1"
gem "elasticsearch-model", "~> 7.0"
gem "elasticsearch-rails", "~> 7.0"
gem "elasticsearch", "~> 7.17"
gem "elasticsearch-model", "~> 7.2"
gem "elasticsearch-rails", "~> 7.2"
gem "elasticsearch-dsl", "~> 0.1.2"
gem "faraday_middleware-aws-sigv4", "~> 0.3"
gem "xml-simple"
Expand Down
34 changes: 16 additions & 18 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,18 @@ GEM
docile (1.3.4)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
elasticsearch (7.10.1)
elasticsearch-api (= 7.10.1)
elasticsearch-transport (= 7.10.1)
elasticsearch-api (7.10.1)
elasticsearch (7.17.7)
elasticsearch-api (= 7.17.7)
elasticsearch-transport (= 7.17.7)
elasticsearch-api (7.17.7)
multi_json
elasticsearch-dsl (0.1.10)
elasticsearch-model (7.1.1)
elasticsearch-model (7.2.1)
activesupport (> 3)
elasticsearch (> 1)
elasticsearch (~> 7)
hashie
elasticsearch-rails (7.1.1)
elasticsearch-transport (7.10.1)
elasticsearch-rails (7.2.1)
elasticsearch-transport (7.17.7)
faraday (~> 1)
multi_json
email_validator (2.2.3)
Expand All @@ -168,7 +168,7 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faraday (1.10.0)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -184,8 +184,8 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
Expand All @@ -201,7 +201,7 @@ GEM
globalid (1.0.0)
activesupport (>= 5.0)
gravtastic (3.2.6)
hashie (4.1.0)
hashie (5.0.0)
high_voltage (3.1.2)
honeybadger (5.0.2)
http-accept (1.7.0)
Expand Down Expand Up @@ -264,7 +264,7 @@ GEM
ruby2_keywords (>= 0.0.5)
msgpack (1.6.0)
multi_json (1.15.0)
multipart-post (2.1.1)
multipart-post (2.2.3)
net-imap (0.2.3)
digest
net-protocol
Expand Down Expand Up @@ -509,12 +509,10 @@ DEPENDENCIES
dalli
delayed_job
delayed_job_active_record
elasticsearch (~> 7.10.1)
elasticsearch-api (~> 7.10.1)
elasticsearch (~> 7.17)
elasticsearch-dsl (~> 0.1.2)
elasticsearch-model (~> 7.0)
elasticsearch-rails (~> 7.0)
elasticsearch-transport (~> 7.10.1)
elasticsearch-model (~> 7.2)
elasticsearch-rails (~> 7.2)
factory_bot_rails
faraday_middleware-aws-sigv4 (~> 0.3)
gravtastic
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/elasticsearch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
if Rails.env.development?
tracer = ActiveSupport::Logger.new('log/elasticsearch.log')
tracer.level = Logger::DEBUG
Elasticsearch::Model.client.transport.tracer = tracer
Elasticsearch::Model.client.transport.transport.tracer = tracer
end