Minor post-merge refactor, mainly moved duplicated method ca_bundle_path into common.rb

This commit is contained in:
2025-08-04 10:50:07 -05:00
parent ad2544a56b
commit 48617b26da
5 changed files with 16 additions and 23 deletions

View File

@@ -1,19 +1,11 @@
class W3DHub
class Api
# Detect CA bundle path for Excon
def self.ca_bundle_path
redhat_path = '/etc/pki/tls/certs/ca-bundle.crt'
debian_path = '/etc/ssl/certs/ca-certificates.crt'
[redhat_path, debian_path].find { |path| File.exist?(path) }
end
# Set Excon default CA file if found
ca_file = ca_bundle_path
if ca_file
if (ca_file = W3DHub.ca_bundle_path)
Excon.defaults[:ssl_ca_file] = ca_file
end
LOG_TAG = "W3DHub::Api".freeze
API_TIMEOUT = 30 # seconds
@@ -295,7 +287,7 @@ class W3DHub
end
# If channel versions and access levels match then all's well
if channel.current_version == _channel.current_version &&
if channel.current_version == _channel.current_version &&
channel.user_level == _channel.user_level
# All's Well!
@@ -310,7 +302,7 @@ class W3DHub
# Replaced, continue.
next
end
# If versions doen't match then pick whichever one is higher
if Gem::Version.new(channel.current_version) > Gem::Version.new(_channel.current_version)
# Replace alternate's channel with primary's channel