search_solr_tools 8.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212ffd0ff43e757dbb703cadc65629ee7fd702b5101b5004e5c5d92ef912c9b1
-  data.tar.gz: 555b2b7a437c60b509f8e53ff23edcbccaa0041e143c1cc1aee42d9447807913
+  metadata.gz: b3ea7011c8dec193a548d8fd55041aa3eeb7ebe8cf9898a76b2181ae1b2f751b
+  data.tar.gz: 7ab1619de2ad05a715e7ceaff6530d2ea3c8d40fb0b25acc9f2f5af26ab6d74d
 SHA512:
-  metadata.gz: 8537a5e35631b4a398def6bce69053aded8b866b83cabb66e5fbbb8e7a94fb0eaca791e683222b03103931894e785798f287103647c37956ff408de960d8b9e8
-  data.tar.gz: 49483d94104e262d9ad52955b341c7d4f654f56ba7d996f6f2dba3a2c7768a0a3a9f11489621cddd20b0cdb844e11d518e8713dd2b665a2c95067d762ad86445
+  metadata.gz: f36385c78277a840c2b0ece657c933a0c2ae6cdd2b05f3090c022fad58e0a26f2aca5f5140709a514b730d0c28ce2984e0edb387004e9203683612088b82beee
+  data.tar.gz: 652b5ffc34e1ba397808d2e5bdc6738c694552e4287963b73caa877184ceb0d7e178d8176ce128a158f9f397c69c5f330933bce9240061fb407c52305623fd5c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v9.0.0 (2026-06-25)
+
+  - Updating configuration to use https: protocol for DCS
+
 ## v8.0.0 (2026-06-12)
 
   - Update to use ruby 3.4.9 and latest gem dependencies

data/bin/search_solr_tools

@@ -85,6 +85,15 @@ class SolrHarvestCLI < Thor
       rescue StandardError => e
         # If it gets here, there is an error that we aren't expecting.
         logger.error "harvest failed for #{target}: #{e.message}"
+        if e.response
+          logger.error "  Status Code: #{e.response[:status]}"
+          logger.error "  Error body: #{e.response[:body]}"
+        end
+        if e.respond_to?(:cause) && e.cause
+          logger.error "  Underlying System Error: #{e.cause.class} - #{e.cause.message}"
+        else
+          logger.error '  Underlying System Error: Cause unknown...'
+        end
         logger.error e.backtrace
         exit SearchSolrTools::Errors::HarvestError::ERRCODE_OTHER
       end
@@ -101,8 +110,8 @@ class SolrHarvestCLI < Thor
   def delete_all
     env = SearchSolrTools::SolrEnvironments[options[:environment]]
     logger.info('DELETE ALL started')
-    `curl 'http://#{env[:host]}:#{env[:port]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<delete><query>*:*</query></delete>'`
-    `curl 'http://#{env[:host]}:#{env[:port]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<commit/>'`
+    `curl -k 'https://#{env[:host]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<delete><query>*:*</query></delete>'`
+    `curl -k 'https://#{env[:host]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<commit/>'`
     logger.info('DELETE ALL complete')
   end
 
@@ -111,8 +120,8 @@ class SolrHarvestCLI < Thor
   def delete_all_auto_suggest
     env = SearchSolrTools::SolrEnvironments[options[:environment]]
     logger.info('DELETE ALL AUTO_SUGGEST started')
-    `curl 'http://#{env[:host]}:#{env[:port]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<delete><query>*:*</query></delete>'`
-    `curl 'http://#{env[:host]}:#{env[:port]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<commit/>'`
+    `curl -k 'https://#{env[:host]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<delete><query>*:*</query></delete>'`
+    `curl -k 'https://#{env[:host]}/solr/update' -H 'Content-Type: text/xml; charset=utf-8' --data '<commit/>'`
     logger.info('DELETE ALL AUTO_SUGGEST complete')
   end
 

data/lib/search_solr_tools/config/environments.yaml

@@ -2,7 +2,6 @@
   :auto_suggest_collection_name: auto_suggest
   :collection_name: nsidc_oai
   :collection_path: solr
-  :port: 8983
 
   # Not using DCS API v2 here because not all retired datasets have their "retired"
   # flag checked. For example, GLA01.033 is retired; GLA01.018 is not, but it
@@ -17,7 +16,7 @@
 :local:
   <<: *common
   :host: localhost
-  :nsidc_dataset_metadata_url: http://integration.nsidc.org/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: https://integration.nsidc.org/api/dataset/metadata/
 
 :dev: &dev
   <<: *common
@@ -25,7 +24,7 @@
   :host: dev.search-solr.USERNAME.dev.int.nsidc.org
   ## For the metadata content, either set up your own instance of dataset-catalog-services
   ## or change the URL below to point to integration
-  :nsidc_dataset_metadata_url: http://dev.dcs.USERNAME.dev.int.nsidc.org:11580/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: https://dev.dcs.USERNAME.dev.int.nsidc.org:11580/api/dataset/metadata/
 
 :development:
   <<: *dev
@@ -33,24 +32,24 @@
 :integration:
   <<: *common
   :host: integration.search-solr.apps.int.nsidc.org
-  :nsidc_dataset_metadata_url: http://integration.nsidc.org/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: https://integration.nsidc.org/api/dataset/metadata/
 
 :qa:
   <<: *common
   :host: qa.search-solr.apps.int.nsidc.org
-  :nsidc_dataset_metadata_url: http://qa.nsidc.org/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: https://qa.nsidc.org/api/dataset/metadata/
 
 :staging:
   <<: *common
   :host: staging.search-solr.apps.int.nsidc.org
-  :nsidc_dataset_metadata_url: http://staging.nsidc.org/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: https://staging.nsidc.org/api/dataset/metadata/
 
 :blue:
   <<: *common
   :host: blue.search-solr.apps.int.nsidc.org
-  :nsidc_dataset_metadata_url: http://nsidc.org/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: https://nsidc.org/api/dataset/metadata/
 
 :production:
   <<: *common
   :host: search-solr.apps.int.nsidc.org
-  :nsidc_dataset_metadata_url: http://nsidc.org/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: https://nsidc.org/api/dataset/metadata/

data/lib/search_solr_tools/errors/harvest_error.rb

@@ -74,7 +74,6 @@ module SearchSolrTools
         super(message)
       end
 
-      # rubocop:disable Metrics/AbcSize
       def exit_code
         if @status_data.nil?
           logger.error "OTHER ERROR REPORTED: #{@other_message}"
@@ -95,7 +94,6 @@ module SearchSolrTools
 
         code
       end
-      # rubocop:enable Metrics/AbcSize
 
       def message
         self.class.describe_exit_code(exit_code).map { |_c, v| v }.join("\n")

data/lib/search_solr_tools/harvesters/auto_suggest.rb

@@ -32,7 +32,9 @@ module SearchSolrTools
           url += "&facet.field=#{name}"
         end
 
-        serialized_facet_response = RestClient.get url
+        serialized_facet_response = RestClient::Request.execute(
+          method: :get, url: url, verify_ssl: OpenSSL::SSL::VERIFY_NONE
+        )
         JSON.parse(serialized_facet_response)
       end
 

data/lib/search_solr_tools/harvesters/base.rb

@@ -5,6 +5,7 @@ require 'nokogiri'
 require 'open-uri'
 require 'rest-client'
 require 'rsolr'
+require 'faraday'
 require 'time'
 
 require 'search_solr_tools'
@@ -30,7 +31,7 @@ module SearchSolrTools
 
       def solr_url
         env = SolrEnvironments[@environment]
-        "http://#{env[:host]}:#{env[:port]}/#{env[:collection_path]}"
+        "https://#{env[:host]}/#{env[:collection_path]}"
       end
 
       # Some data providers require encoding (such as URI.encode),
@@ -50,12 +51,12 @@ module SearchSolrTools
 
         # Some docs will cause solr to time out during the POST
         begin
-          RestClient.get(url) do |response, _request, _result|
-            success = response.code == 200
+          RestClient::Request.execute(method: :get, url: url, verify_ssl: OpenSSL::SSL::VERIFY_NONE) do |response, _request, _result|
+            success = (200..299).include?(response.code)
             logger.error "Error in ping request: #{response.body}" unless success
           end
         rescue StandardError => e
-          logger.error "Rest exception while pinging Solr: #{e}"
+          logger.error "Rest exception while pinging Solr at #{url}: #{e}"
         end
         success
       end
@@ -80,7 +81,15 @@ module SearchSolrTools
       def delete_old_documents(timestamp, constraints, solr_core, force: false)
         constraints = sanitize_data_centers_constraints(constraints)
         delete_query = "last_update:[* TO #{timestamp}] AND #{constraints}"
-        solr = RSolr.connect url: solr_url + "/#{solr_core}"
+        full_solr_url = "#{solr_url}/#{solr_core}"
+
+        faraday_connection = Faraday.new(url: full_solr_url, ssl: { verify: false }) do |conn|
+          conn.request :url_encoded
+          conn.adapter Faraday.default_adapter
+        end
+
+        solr = RSolr.connect(faraday_connection, url: full_solr_url)
+
         unchanged_count = (solr.get 'select', params: { wt: :ruby, q: delete_query, rows: 0 })['response']['numFound'].to_i
         if unchanged_count.zero?
           logger.info "All documents were updated after #{timestamp}, nothing to delete"
@@ -145,8 +154,10 @@ module SearchSolrTools
 
         # Some docs will cause solr to time out during the POST
         begin
-          RestClient.post(url, doc_serialized, content_type:) do |response, _request, _result|
-            success = response.code == 200
+          RestClient::Request.execute(
+            method: :post, url: url, payload: doc_serialized, headers: { content_type: }, verify_ssl: OpenSSL::SSL::VERIFY_NONE
+          ) do |response, _request, _result|
+            success = (200..299).include?(response.code)
             unless success
               logger.error "Error for #{doc_serialized}\n\n response: #{response.body}"
               status = Helpers::HarvestStatus::INGEST_ERR_SOLR_ERROR

data/lib/search_solr_tools/harvesters/nsidc_json.rb

@@ -18,7 +18,7 @@ module SearchSolrTools
       def ping_source
         begin
           RestClient.options(nsidc_json_url) do |response, _request, _result|
-            return response.code == 200
+            return (200..299).include? response.code
           end
         rescue StandardError
           logger.error "Error trying to get options for #{nsidc_json_url} (ping)"
@@ -45,6 +45,7 @@ module SearchSolrTools
 
         raise Errors::HarvestError, status unless status.ok?
       rescue Errors::HarvestError => e
+        logger.error 'A HarvestError occurred'
         raise e
       rescue StandardError => e
         logger.error "An unexpected exception occurred while trying to harvest or insert: #{e}"

data/lib/search_solr_tools/helpers/facet_configuration.rb

@@ -11,7 +11,11 @@ module SearchSolrTools
       include Singleton
 
       def self.import_bin_configuration(env)
-        @bin_configuration = JSON.parse(RestClient.get("#{SolrEnvironments[env][:nsidc_dataset_metadata_url]}binConfiguration")) if @bin_configuration.nil?
+        return unless @bin_configuration.nil?
+
+        @bin_configuration = JSON.parse(
+          RestClient::Request.execute(method: :get, url: "#{SolrEnvironments[env][:nsidc_dataset_metadata_url]}binConfiguration", verify_ssl: OpenSSL::SSL::VERIFY_NONE)
+        )
       end
 
       def self.get_facet_bin(facet_name)

data/lib/search_solr_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SearchSolrTools
-  VERSION = '8.0.0'
+  VERSION = '9.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Chris Chalstrom