Incorrect Solr URI

[laritakr]

Descriptive summary

The issue appears to originate in Hyrax's post method. This method calls Hyrax's connection definition. As use_valkyrie is true, we aren't getting the correct connection url.

    # Wraps rsolr post
    # @return [Hash] the hash straight form rsolr
    def post(query = nil, **args)
      # Make Hyrax.config.solr_select_path the default SOLR path
      solr_path = args.delete(:path) || Hyrax.config.solr_select_path
      args = args.merge(additional_solr_get_and_post_params.merge(q: query)) if query.present?
      connection.post(solr_path, data: args)
    end

    def connection
      return self.class.instance.conn unless use_valkyrie
      valkyrie_index.connection
    end

(byebug) valkyrie_index
#<Valkyrie::Indexing::Solr::IndexingAdapter:0x0000ffff800b3850 @connection=#<RSolr::Client:0x0000ffff6314df30 @uri=#<URI::HTTP http://solr:SolrRocks@solr:8983/solr/hyrax-valkyrie/>, @proxy=nil, @connection=nil, @update_format=RSolr::JSON::Generator, @update_path="update", @options={:url=>"http://solr:SolrRocks@solr:8983/solr/hyrax-valkyrie"}>>
(byebug) use_valkyrie
true

(byebug) self.class.instance.conn
DEPRECATION WARNING: Calls to Hyrax::SolrService.instance are deprecated and support will be removed from Hyrax 4.0. Use methods in Hyrax::SolrService instead. (called from instance at /app/samvera/hyrax-webapp/vendor/gems/hyrax/app/services/hyrax/solr_service.rb:56)
#<RSolr::Client:0x0000ffff7792db10 @uri=#<URI::HTTP http://solr:SolrRocks@solr:8983/solr/fca34cf3-87f3-4056-9678-23b7a108e5ae/>, @proxy=nil, @connection=nil, @update_format=RSolr::JSON::Generator, @update_path="update", @options={"timeout"=>120, "open_timeout"=>120, "url"=>"http://solr:SolrRocks@solr:8983/solr/fca34cf3-87f3-4056-9678-23b7a108e5ae", "collection"=>"fca34cf3-87f3-4056-9678-23b7a108e5ae", "core"=>"fca34cf3-87f3-4056-9678-23b7a108e5ae"}>

Related work

Prior attempt at fixing the issue does not work and should probably be removed:

hyku/app/models/solr_endpoint.rb

Lines 39 to 43 in e720484

	# Because of code in Valkyrie::Indexing::Solr::IndexingAdapter we may want
	# to include the 'core' key in this hash.
	#
	# https://github.com/samvera/hyrax/blob/a5a0ae9e56df857a92fc53ae86216cbb007db47a/lib/valkyrie/indexing/solr/indexing_adapter.rb#L83-L101
	base_options['core'] ||= switchable_options['collection']