To store checkpoint urls directly in Environment variables

Author: yzhoubk

config/application.rb

@@ -22,9 +22,9 @@ class Application < Rails::Application
 
     config.x.servers ||= {}
 
-    config.x.servers[:geoserver] = ENV.fetch('GEOSERVER_URL_FILE', nil)
-    config.x.servers[:geoserver_secure] = ENV.fetch('GEOSERVER_SECURE_URL_FILE', nil)
-    config.x.servers[:spatial_server] = ENV.fetch('SPATIAL_URL', nil)
+    config.x.servers[:geoserver] = ENV.fetch('GEODATA_GEOSERVER_PUBLIC_HEALTHCHECK_URL', nil)
+    config.x.servers[:geoserver_secure] = ENV.fetch('GEODATA_GEOSERVER_SECURE_HEALTHCHECK_URL', nil)
+    config.x.servers[:spatial_server] = ENV.fetch('GEODATA_SPATIAL_HEALTHCHECK_URL', nil)
 
     # The Base URL for the generated sitemap
     config.x.sitemap.base_url = ENV.fetch('GEODATA_BASE_URL', 'http://localhost:3000')

lib/endpoint_url.rb

@@ -1,4 +1,3 @@
-require 'uri'
 class EndpointUrl
   class << self
     def geoserver(server_name)
@@ -7,30 +6,14 @@ def geoserver(server_name)
     end
 
     def spatial_server(server_name)
-      url = Rails.configuration.x.servers[server_name]
+      url = get_url(server_name)
       url && "#{url.sub(%r{/+\z}, '')}/public/berkeley-status/data.zip"
     end
 
     private
 
     def get_url(server_name)
-      secret_file = Rails.configuration.x.servers[server_name]
-      raise Errno::ENOENT if secret_file.nil?
-
-      url = File.read(secret_file).chomp
-      safe_url(url)
-    rescue StandardError => e
-      Rails.logger.error "[EndpointUrl] Failed to read #{server_name}'s URL from secrets file.#{e.message}"
-      nil
-    end
-
-    def safe_url(url)
-      return if url.nil?
-
-      uri = URI(url)
-      uri.user = nil
-      uri.password = nil
-      uri.to_s.sub(%r{/rest/?$}, '')
+      Rails.configuration.x.servers[server_name]
     end
   end
 end

lib/http_head_check.rb

@@ -29,7 +29,7 @@ def perform_request
     rescue Net::OpenTimeout, Net::ReadTimeout => e
       raise ConnectionFailed, "#{url} did not respond within #{request_timeout} seconds: #{e.message}"
     rescue ArgumentError => e
-      raise ConnectionFailed, "Invalid URL format for '#{url}', please check log; #{e.class}: #{e.message}"
+      raise ConnectionFailed, "Invalid URL format for '#{url}': #{e.class}: #{e.message}"
     rescue StandardError => e
       raise ConnectionFailed, e.message
     end

spec/lib/endpoint_url_spec.rb

@@ -1,71 +1,40 @@
 require 'rails_helper'
+require_relative '../../lib/endpoint_url'
+
+RSpec.describe EndpointUrl do
+  around do |example|
+    original = Rails.configuration.x.servers.dup
+    Rails.configuration.x.servers.clear
+    example.run
+    Rails.configuration.x.servers.clear
+    Rails.configuration.x.servers.merge!(original)
+  end
 
-describe EndpointUrl do
   describe '.geoserver' do
-    context 'when server is configured and file exists' do
-      let(:secret_file) { 'tmp/test_secret.txt' }
-
-      before do
-        allow(Rails.configuration.x.servers).to receive(:[]).with('test_server').and_return(secret_file)
-        File.write(secret_file, 'https://user:pass@example.com/rest/')
-      end
+    it 'builds a GetCapabilities URL without duplicate slashes' do
+      Rails.configuration.x.servers[:geoserver] = 'https://example.com/geoserver//'
 
-      after do
-        FileUtils.rm_f(secret_file)
-      end
+      result = described_class.geoserver(:geoserver)
 
-      it 'returns WMS endpoint URL' do
-        result = EndpointUrl.geoserver('test_server')
-        expect(result).to eq('https://example.com/wms?service=WMS&request=GetCapabilities')
-      end
+      expect(result).to eq('https://example.com/geoserver/wms?service=WMS&request=GetCapabilities')
     end
 
-    context 'when file does not exist' do
-      before do
-        allow(Rails.configuration.x.servers).to receive(:[]).with('test_server').and_return('nonexistent_file.txt')
-      end
-
-      it 'logs error and returns nil' do
-        expect(Rails.logger).to receive(:error).with("[EndpointUrl] Failed to read test_server's URL from secrets file.No such file or directory @ rb_sysopen - nonexistent_file.txt")
-        result = EndpointUrl.geoserver('test_server')
-        expect(result).to be_nil
-      end
-    end
-
-    context 'when server is not configured' do
-      before do
-        allow(Rails.configuration.x.servers).to receive(:[]).with('missing_server').and_return(nil)
-      end
-
-      it 'returns nil without logging error' do
-        result = EndpointUrl.geoserver('missing_server')
-        expect(result).to be_nil
-      end
+    it 'returns nil when server is not configured' do
+      expect(described_class.geoserver(:unknown)).to be_nil
     end
   end
 
   describe '.spatial_server' do
-    context 'when server is configured' do
-      before do
-        allow(Rails.configuration.x.servers).to receive(:[]).with('test_server').and_return('https://example.com')
-      end
+    it 'builds the status data URL trimming trailing slashes' do
+      Rails.configuration.x.servers[:spatial_server] = 'https://example.com/status/'
 
-      it 'returns spatial server data zip endpoint URL' do
-        result = EndpointUrl.spatial_server('test_server')
-        expect(result).to eq('https://example.com/public/berkeley-status/data.zip')
-      end
-    end
+      result = described_class.spatial_server(:spatial_server)
 
-    context 'when server is not configured' do
-      before do
-        allow(Rails.configuration.x.servers).to receive(:[]).with('missing_server').and_return(nil)
-      end
+      expect(result).to eq('https://example.com/status/public/berkeley-status/data.zip')
+    end
 
-      it 'returns nil' do
-        result = EndpointUrl.spatial_server('missing_server')
-        expect(result).to be_nil
-      end
+    it 'returns nil when server is not configured' do
+      expect(described_class.spatial_server(:missing)).to be_nil
     end
   end
-
 end