Solr only has HTTP, not HTTPS

Co-authored-by: Christina Chortaria <[email protected]>

app/models/concerns/solr.rb

@@ -6,10 +6,10 @@ module Solr
   def solr_service_response(query_terms:)
     query = "q=#{query_terms}&rows=3&facet=false&fl=#{solr_fields.join(',')}&sort=#{solr_sort}"
     query = "#{query}&#{extra_solr_params}" if respond_to? :extra_solr_params
-    uri = url_builder.build(host: solr_config[:host],
-                            port: solr_config[:port],
-                            path: "/solr/#{solr_collection}/select",
-                            query:)
+    uri = URI::HTTP.build(host: solr_config[:host],
+                          port: solr_config[:port],
+                          path: "/solr/#{solr_collection}/select",
+                          query:)
     response = Net::HTTP.get(uri)
     JSON.parse(response, symbolize_names: true)
   end
@@ -33,10 +33,6 @@ def url(document:)
 
   private
 
-  def url_builder
-    solr_config[:ssl] ? URI::HTTPS : URI::HTTP
-  end
-
   def solr_collection
     Rails.application.config_for(:allsearch)[service][:solr][:collection]
   end

config/allsearch.yml

@@ -4,25 +4,21 @@ default: &default
       host: "lib-solr8-prod.princeton.edu"
       port: 8983
       collection: "catalog-alma-production"
-      ssl: true
   dpul:
     solr:
       host: "lib-solr8-prod.princeton.edu"
       port: 8983
       collection: "dpul-production"
-      ssl: true
   findingaids:
     solr:
       host: "lib-solr8-prod.princeton.edu"
       port: 8983
       collection: "pulfalight-production"
-      ssl: true
   pulmap:
     solr: 
       host: "lib-solr8-prod.princeton.edu"
       port: 8983
       collection: "pulmap"
-      ssl: true 
 
 development:
   <<: *default
@@ -31,28 +27,24 @@ development:
       host: <%= ENV["lando_catalog_solr_conn_host"] %>
       port: <%= ENV["lando_catalog_solr_conn_port"] %>
       collection: "catalog"
-      ssl: false
 
   dpul:
     solr:
       host: <%= ENV["lando_dpul_solr_conn_host"] %>
       port: <%= ENV["lando_dpul_solr_conn_port"] %>
       collection: "dpul"
-      ssl: false
 
   findingaids:
     solr:
       host: <%= ENV["lando_findingaids_solr_conn_host"] %>
       port: <%= ENV["lando_findingaids_solr_conn_port"] %>
       collection: "findingaids"
-      ssl: false
 
   pulmap:
     solr:
       host: <%= ENV["lando_pulmap_solr_conn_host"] %>
       port: <%= ENV["lando_pulmap_solr_conn_port"] %> 
       collection: "pulmap"
-      ssl: false
 
 staging:
   <<: *default
@@ -61,19 +53,16 @@ staging:
       host: "lib-solr8-staging.princeton.edu"
       port: 8983
       collection: "catalog-alma-staging"
-      ssl: true
   dpul:
     solr:
       host: "lib-solr8-staging.princeton.edu"
       port: 8983
       collection: "dpul-staging"
-      ssl: true
   findingaids:
     solr:
       host: "lib-solr8-staging.princeton.edu"
       port: 8983
       collection: "pulfalight-staging"
-      ssl: true
 
 test:
   <<: *default

spec/requests/catalog_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe 'GET /search/catalog' do
   it 'returns json' do
-    stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=rubix&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
+    stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=rubix&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
       .to_return(status: 200, body: file_fixture('solr/catalog/rubix.json'))
     get '/search/catalog?query=rubix'
 
@@ -14,7 +14,7 @@
 
   context 'with a search term' do
     before do
-      stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=rubix&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
+      stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=rubix&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
         .to_return(status: 200, body: file_fixture('solr/catalog/rubix.json'))
     end
 
@@ -67,7 +67,7 @@
 
   context 'without a publisher in records' do
     before do
-      stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=pangulubalang&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
+      stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=pangulubalang&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
         .to_return(status: 200, body: file_fixture('solr/catalog/pangulubalang.json'))
     end
 
@@ -87,7 +87,7 @@
 
   context 'with weird search strings' do
     before do
-      stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=What%20if%20%22I%20quote%22%20my%20search?&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
+      stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=What%20if%20%22I%20quote%22%20my%20search?&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
         .to_return(status: 200, body: file_fixture('solr/catalog/what_if.json'))
     end
 
@@ -103,7 +103,7 @@
 
   context 'with CJK characters' do
     before do
-      stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=%E8%A7%A6%E7%89%A9%E7%94%9F%E6%83%85%E8%AF%9D%E9%81%93%E5%8D%97&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
+      stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/catalog-alma-production/select?facet=false&fl=id,title_display,author_display,pub_created_display,format,holdings_1display&q=%E8%A7%A6%E7%89%A9%E7%94%9F%E6%83%85%E8%AF%9D%E9%81%93%E5%8D%97&rows=3&sort=score%20desc,%20pub_date_start_sort%20desc,%20title_sort%20asc')
         .to_return(status: 200, body: file_fixture('solr/catalog/触物生情话道南.json'))
     end
 

spec/requests/dpul_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe 'GET /search/dpul' do
   it 'returns json' do
-    stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/dpul-production/select?facet=false&fl=id,readonly_title_ssim,readonly_creator_ssim,readonly_publisher_ssim,readonly_format_ssim,readonly_collections_tesim&q=cats&rows=3&sort=score%20desc')
+    stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/dpul-production/select?facet=false&fl=id,readonly_title_ssim,readonly_creator_ssim,readonly_publisher_ssim,readonly_format_ssim,readonly_collections_tesim&q=cats&rows=3&sort=score%20desc')
       .to_return(status: 200, body: file_fixture('solr/dpul/cats.json'))
     get '/search/dpul?query=cats'
 
@@ -14,7 +14,7 @@
 
   context 'with a search term' do
     before do
-      stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/dpul-production/select?facet=false&fl=id,readonly_title_ssim,readonly_creator_ssim,readonly_publisher_ssim,readonly_format_ssim,readonly_collections_tesim&q=cats&rows=3&sort=score%20desc')
+      stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/dpul-production/select?facet=false&fl=id,readonly_title_ssim,readonly_creator_ssim,readonly_publisher_ssim,readonly_format_ssim,readonly_collections_tesim&q=cats&rows=3&sort=score%20desc')
         .to_return(status: 200, body: file_fixture('solr/dpul/cats.json'))
     end
 

spec/requests/findingaids_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe 'GET /search/findingaids' do
   it 'returns json' do
-    stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/pulfalight-production/select?facet=false&fl=id,collection_ssm,creator_ssm,level_sim,scopecontent_ssm,repository_ssm,extent_ssm,accessrestrict_ssm&q=cats&rows=3&sort=score%20desc,%20title_sort%20asc&fq=level_sim:Collection')
+    stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/pulfalight-production/select?facet=false&fl=id,collection_ssm,creator_ssm,level_sim,scopecontent_ssm,repository_ssm,extent_ssm,accessrestrict_ssm&q=cats&rows=3&sort=score%20desc,%20title_sort%20asc&fq=level_sim:Collection')
       .to_return(status: 200, body: file_fixture('solr/findingaids/cats.json'))
     get '/search/findingaids?query=cats'
 
@@ -14,7 +14,7 @@
 
   context 'with a search term' do
     before do
-      stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/pulfalight-production/select?facet=false&fl=id,collection_ssm,creator_ssm,level_sim,scopecontent_ssm,repository_ssm,extent_ssm,accessrestrict_ssm&q=cats&rows=3&sort=score%20desc,%20title_sort%20asc&fq=level_sim:Collection')
+      stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/pulfalight-production/select?facet=false&fl=id,collection_ssm,creator_ssm,level_sim,scopecontent_ssm,repository_ssm,extent_ssm,accessrestrict_ssm&q=cats&rows=3&sort=score%20desc,%20title_sort%20asc&fq=level_sim:Collection')
         .to_return(status: 200, body: file_fixture('solr/findingaids/cats.json'))
     end
 

spec/requests/pulmap_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe 'GET /search/pulmap' do
   it 'returns json' do
-    stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/pulmap/select?facet=false&fl=uuid,dc_title_s,dc_creator_sm,dc_publisher_s,dc_format_s,dc_description_s,dc_rights_s,layer_geom_type_s&q=scribner&rows=3&sort=score%20desc')
+    stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/pulmap/select?facet=false&fl=uuid,dc_title_s,dc_creator_sm,dc_publisher_s,dc_format_s,dc_description_s,dc_rights_s,layer_geom_type_s&q=scribner&rows=3&sort=score%20desc')
       .to_return(status: 200, body: file_fixture('solr/pulmap/scribner.json'))
     get '/search/pulmap?query=scribner'
 
@@ -14,7 +14,7 @@
 
   context 'with a search term' do
     before do
-      stub_request(:get, 'https://lib-solr8-prod.princeton.edu:8983/solr/pulmap/select?facet=false&fl=uuid,dc_title_s,dc_creator_sm,dc_publisher_s,dc_format_s,dc_description_s,dc_rights_s,layer_geom_type_s&q=scribner&rows=3&sort=score%20desc')
+      stub_request(:get, 'http://lib-solr8-prod.princeton.edu:8983/solr/pulmap/select?facet=false&fl=uuid,dc_title_s,dc_creator_sm,dc_publisher_s,dc_format_s,dc_description_s,dc_rights_s,layer_geom_type_s&q=scribner&rows=3&sort=score%20desc')
         .to_return(status: 200, body: file_fixture('solr/pulmap/scribner.json'))
     end