use berkeley_library-util gem to add head_check for okcomputer

Author: jason-raitz

.gitignore

@@ -40,6 +40,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+/vendor/
 
 # Used by dotenv library to load environment variables.
 # .env

Gemfile

@@ -8,6 +8,7 @@ ruby ruby_version_exact
 gem 'berkeley_library-av-core', '~> 0.5.0'
 gem 'berkeley_library-docker', '~> 0.2.0'
 gem 'berkeley_library-logging', '~> 0.2'
+gem 'berkeley_library-util', '~> 0.3'
 gem 'browser', '~> 4.2'
 gem 'jbuilder', '~> 2.13'
 gem 'mutex_m'

Gemfile.lock

@@ -95,7 +95,7 @@ GEM
       marc (~> 1.0)
       parslet (~> 2.0)
       ruby-marc-spec (~> 0.1)
-    berkeley_library-util (0.2.0)
+    berkeley_library-util (0.3.0)
       berkeley_library-logging (~> 0.3)
       rest-client (~> 2.1)
       typesafe_enum (~> 0.3)
@@ -421,13 +421,15 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-25
   x86_64-darwin-19
   x86_64-linux
 
 DEPENDENCIES
   berkeley_library-av-core (~> 0.5.0)
   berkeley_library-docker (~> 0.2.0)
   berkeley_library-logging (~> 0.2)
+  berkeley_library-util (~> 0.3)
   brakeman
   browser (~> 4.2)
   bundle-audit

config/initializers/okcomputer.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require 'berkeley_library/util/uris/head_check'
+
 # Health check configuration
 
 OkComputer.logger = Rails.logger
-OkComputer.check_in_parallel = true
+OkComputer.check_in_parallel = !Rails.env.test?
 
 ALMA_TEST_ID = 'b23305522'
 TIND_TEST_ID = '(pacradio)01469'
@@ -26,29 +28,13 @@ def check
   end
 end
 
-class HeadCheck < OkComputer::HttpCheck
-  def perform_request
-    Timeout.timeout(request_timeout) do
-      options = { read_timeout: request_timeout }
-
-      if basic_auth_options.any?
-        options[:http_basic_authentication] = basic_auth_options
-      end
-
-      RestClient.head(url.to_s, options)
-    end
-  rescue => e
-    raise ConnectionFailed, e
-  end
-end
-
 # Ensure Alma API is working.
-OkComputer::Registry.register 'alma-metadata', HeadCheck.new(ALMA_TEST_URL)
+OkComputer::Registry.register 'alma-metadata', BerkeleyLibrary::Util::HeadCheck.new(ALMA_TEST_URL)
 
 # Ensure TIND API is working. This cannot use `OkComputer::HttpCheck`
 # out of the box as we can't yet inject headers into the request without
 # subclassing the whole thing.
 OkComputer::Registry.register 'tind-metadata', TindCheck.new
 
 # Ensure Wowza is working
-OkComputer::Registry.register 'wowza-streaming', HeadCheck.new(WOWZA_TEST_URL)
+OkComputer::Registry.register 'wowza-streaming', BerkeleyLibrary::Util::HeadCheck.new(WOWZA_TEST_URL)

spec/request/okcomputer_spec.rb

@@ -4,7 +4,6 @@
   before do
     stub_sru_head_request('b23305522')
 
-    hls_manifest = File.read('spec/data/playlist.m3u8')
     manifest_url = 'https://wowza.lib.berkeley.edu/Pacifica/mp3:PRA_NHPRC1_AZ1084_00_000_00.mp3/playlist.m3u8'
     stub_request(:head, manifest_url).to_return(status: 200)
 
@@ -20,6 +19,7 @@
 
   it 'returns all checks to /health' do
     get '/health'
+
     expect(response).to have_http_status :ok
     expect(response.parsed_body.keys).to match_array %w[
       alma-metadata

spec/spec_helper.rb

@@ -72,7 +72,7 @@ def stub_sru_request(record_id, body: nil)
   stub_request(:get, sru_url).to_return(status: 200, body: body || File.new(alma_sru_data_path_for(record_id)))
 end
 
-def stub_sru_head_request(record_id, body: nil)
+def stub_sru_head_request(record_id)
   sru_url = alma_sru_url_for(record_id)
   stub_request(:head, sru_url).to_return(status: 200)
 end