Remove compatibility helpers for Elasticsearch to Opensearch

lib/index.rb

@@ -118,7 +118,7 @@ def documents_by_format(format, field_definitions)
     def raw_search(payload)
       logger.debug "Request payload: #{payload.to_json}"
 
-      ElasticsearchClient.search(index_name: @index_name, body: payload, client: @client)
+      @client.search(index: @index_name, track_total_hits: true, body: payload)
     end
 
     # Convert a best bet query to a string formed by joining the normalised

lib/index/elasticsearch_processor.rb

@@ -14,12 +14,12 @@ def initialize(client:)
     end
 
     def save(presenter)
-      @actions << { index: ElasticsearchClient.compatible_identifier(presenter.identifier) }
+      @actions << { index: presenter.identifier }
       @actions << presenter.document
     end
 
     def delete(presenter)
-      @actions << { delete: ElasticsearchClient.compatible_identifier(presenter.identifier) }
+      @actions << { delete: presenter.identifier }
     end
 
     def commit

lib/indexer/popularity_lookup.rb

@@ -77,7 +77,7 @@ def traffic_index_size
           query: { match_all: {} },
           size: 0,
         })
-        ElasticsearchResponse.new(response).total_hits
+        response.dig("hits", "total", "value")
       end
     end
 

lib/rummager.rb

@@ -142,7 +142,6 @@
 require "search/suggestion_blocklist"
 require "search/timed_cache"
 
-require "elasticsearch_response"
 require "index"
 require "index_finder"
 require "index_group"
@@ -164,7 +163,6 @@
 require "scroll_enumerator"
 
 require "elasticsearch_config"
-require "elasticsearch_client"
 require "clusters/clusters"
 require "clusters/cluster"
 require "search_config"

lib/schema/index_schema.rb

@@ -14,9 +14,9 @@ def es_mappings
       "document_type" => @document_type_field,
     }
     @elasticsearch_types.each_value do |value|
-      properties = properties.merge(value.es_config)
+      properties.merge!(value.es_config)
     end
-    ElasticsearchClient.compatible_mappings(properties)
+    { "properties" => properties }
   end
 
   def elasticsearch_type(elasticsearch_type_name)

lib/schema_synchroniser.rb

@@ -5,7 +5,7 @@ def initialize(index_name, client = Services.elasticsearch)
   end
 
   def sync_mappings(mapping, logger = Logger.new($stdout))
-    ElasticsearchClient.put_mapping(index_name: @index_name, mapping:, client: @client)
+    @client.indices.put_mapping(index: @index_name, body: mapping)
     logger.info "Updated mappings for index: #{@index_name}"
   rescue OpenSearch::Transport::Transport::Errors::BadRequest => e
     logger.warn "Unable to update mappings for index: #{@index_name}; #{e.message}"

lib/scroll_enumerator.rb

@@ -17,7 +17,7 @@ def initialize(client:, index_names:, search_body:, batch_size: DEFAULT_BATCH_SI
     @client = client
     @index_names = index_names
     page = initial_scroll_result(batch_size, search_body)
-    @size = ElasticsearchResponse.new(page).total_hits
+    @size = page.dig("hits", "total", "value")
 
     # Pull out the results as they are needed
     super() do |yielder|

lib/search/aggregate_example_fetcher.rb

@@ -104,7 +104,7 @@ def prepare_response(slugs, response_list)
       result = {}
       slugs.zip(response_list) do |slug, response|
         result[slug] = {
-          total: ElasticsearchResponse.new(response).total_hits,
+          total: response.dig("hits", "total", "value"),
           examples: response["hits"]["hits"].map { |hit| apply_multivalued(hit["_source"] || {}) },
         }
       end

lib/search/presenters/result_set_presenter.rb

@@ -25,7 +25,7 @@ def initialize(search_params:,
     def present
       response = {
         results: presented_results,
-        total: ElasticsearchResponse.new(es_response).total_hits || 0,
+        total: es_response.dig("hits", "total", "value") || 0,
         start: search_params.start,
         search_params.aggregate_name => presented_aggregates,
         suggested_queries:,

lib/sitemap/generator.rb

@@ -73,7 +73,7 @@ def get_all_documents
       page                  = initial_scroll
       scroll_id             = page["_scroll_id"]
       documents             = page["hits"]["hits"]
-      total_documents_count = ElasticsearchResponse.new(page).total_hits
+      total_documents_count = page.dig("hits", "total", "value")
       total_page_count      = total_documents_count.fdiv(SCROLL_BATCH_SIZE).ceil
       chunk                 = [homepage]
 

lib/tasks/delete.rake

@@ -10,7 +10,7 @@ namespace :delete do
     id = args[:link]
     abort "Missing argument. Usage: rake 'delete:by_link[link]'" if args[:link].nil?
 
-    ElasticsearchClient.delete(id:, index_name: SearchConfig.govuk_index_name)
+    Services.elasticsearch.delete(index: SearchConfig.govuk_index_name, id:)
   end
 
   desc "

lib/tasks/indices.rake

@@ -139,7 +139,7 @@ the existing data, you will need to run the \"migrate_schema\" task instead, whi
         mappings = search_config.schema_config.elasticsearch_mappings(index_name)
 
         synchroniser = SchemaSynchroniser.new(index_name, Services.elasticsearch(cluster:))
-        synchroniser.sync_mappings(ElasticsearchClient.mappings_properties(mappings), logger)
+        synchroniser.sync_mappings(mappings, logger)
         puts "Successfully synchronised #{index_name} index"
       rescue OpenSearch::Transport::Transport::Errors::BadRequest => e
         puts "Unable to synchronise index #{index_name} due to #{e.message}"

spec/integration/schema_synchroniser_spec.rb

@@ -36,10 +36,6 @@
     synchroniser.sync_mappings(mapping, logger)
 
     response = Services.elasticsearch.indices.get_mapping(index: SearchConfig.govuk_index_name)
-    if ElasticsearchClient.es7?
-      expect(response.values.dig(0, "mappings", "properties", "test")).to eq({ "type" => "keyword" })
-    else
-      expect(response.values.dig(0, "mappings", "generic-document", "properties", "test")).to eq({ "type" => "keyword" })
-    end
+    expect(response.values.dig(0, "mappings", "properties", "test")).to eq({ "type" => "keyword" })
   end
 end

spec/spec_helper.rb

@@ -117,12 +117,6 @@
     ClimateControl.modify(TZ: "UTC") { example.run }
   end
 
-  config.around(:each, :unit) do |example|
-    ClimateControl.modify(USE_ELASTICSEARCH_7: "true") do
-      example.run
-    end
-  end
-
   if config.files_to_run.one?
     config.default_formatter = "doc"
   end

spec/support/integration_test_helper.rb

@@ -70,7 +70,7 @@ def insert_document(index_name, attributes, id: nil, type: "edition", version: n
     atts[:link] ||= id
 
     clusters.each do |cluster|
-      ElasticsearchClient.index(id:, index_name:, atts:, params: version_details, client: client(cluster:))
+      client(cluster:).index({ index: index_name, id:, body: atts }.merge(version_details))
     end
 
     id