boring_services 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e386da541954a876687c37adade51199a571e5b75bc5583946a676a42a69e5e0
-  data.tar.gz: bb16f6517193ad18614eb91632c462e031856d06ac9d73abd25675698df50f43
+  metadata.gz: 156bb67ea987370602ed678f3d8a525f6eeae09dcbc2a3ae8ac23fa85b474ca4
+  data.tar.gz: 8ce1325011cac932711b77afed6a5d0307bebedaa4e52fc2b65d9a153daf2e91
 SHA512:
-  metadata.gz: 87986c7987ff4b9ee2490fe4ca8035ad536a90b571d2d9cdcf0d995c93a4e8d7e8c2836a2c4fa99fcf2137c1096aad91c166b300b1ff4a88df817220e29aaa51
-  data.tar.gz: ae84eb250c619ceb130e90db62fb4538939ee22755700e42231164f3c012ab67df397a5ad6f927534862827b346cf00f82b563b154a97ea698835f798275e8cc
+  metadata.gz: 72bf5746276b30243a9b75b8091491afd3e58e5e8feac6b3a8f62bc7cafa8f9088d6d1f279f075b6f3f77d0f350017a4bf277e18a3ef4844d273293fb2f3b363
+  data.tar.gz: 07ac07fe8b309a06ff23ca77a7681aab03c77d8ecc0fac5e86e6723c999eb05976827e2bafdd072f7dfc0eef700c731329402a627b6ab64d2492983aaf6d125f

data/lib/boring_services/railtie.rb

@@ -5,6 +5,12 @@ begin
     class Railtie < Rails::Railtie
       railtie_name :boring_services
 
+      # Initialize service locator after Rails config is loaded
+      initializer 'boring_services.initialize' do
+        # Reset locator so it picks up the correct Rails environment
+        BoringServices.reset_locator!
+      end
+
       rake_tasks do
         load File.expand_path('../tasks/services.rake', __dir__)
       end

data/lib/boring_services/service_locator.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+module BoringServices
+  class ServiceLocator
+    attr_reader :config
+
+    def initialize(config = nil)
+      @config = config || Configuration.load
+    end
+
+    # Get all hosts for a service
+    # Returns array of host hashes with :host, :private_ip, :label keys
+    def hosts_for(service_name)
+      service = config.service_config(service_name.to_s)
+      return [] unless service
+
+      normalize_hosts(service['hosts'] || [])
+    end
+
+    # Get the connection IP for a service by region/label
+    # Prefers private_ip, falls back to host
+    # Label matching: "redis-eu" matches region "eu", "redis-us" matches "us"
+    def host_for_region(service_name, region)
+      return nil if region.to_s.strip.empty?
+
+      hosts = hosts_for(service_name)
+      host_entry = hosts.find do |h|
+        label = h[:label].to_s.downcase
+        region_str = region.to_s.downcase
+        label == region_str || label.end_with?("-#{region_str}") || label.start_with?("#{region_str}-")
+      end
+
+      return nil unless host_entry
+
+      connection_ip(host_entry)
+    end
+
+    # Get the first available host for a service (prefers private_ip)
+    def primary_host(service_name)
+      hosts = hosts_for(service_name)
+      return nil if hosts.empty?
+
+      connection_ip(hosts.first)
+    end
+
+    # Get all connection IPs for a service (prefers private_ip for each)
+    def all_hosts(service_name)
+      hosts_for(service_name).map { |h| connection_ip(h) }
+    end
+
+    # Get port for a service
+    def port_for(service_name)
+      service = config.service_config(service_name.to_s)
+      service&.dig('port')
+    end
+
+    # Build a Redis URL for a region
+    def redis_url(region: nil, password: nil, db: 0)
+      host = region ? host_for_region('redis', region) : primary_host('redis')
+      return nil unless host
+
+      port = port_for('redis') || 6379
+      auth = password.to_s.empty? ? '' : ":#{password}@"
+      "redis://#{auth}#{host}:#{port}/#{db}"
+    end
+
+    # Build memcached connection string (host:port,host:port format)
+    def memcached_servers(region: nil)
+      hosts = if region
+                host = host_for_region('memcached', region)
+                host ? [host] : []
+              else
+                all_hosts('memcached')
+              end
+
+      return nil if hosts.empty?
+
+      port = port_for('memcached') || 11211
+      hosts.map { |h| "#{h}:#{port}" }.join(',')
+    end
+
+    private
+
+    # Normalize hosts array - handles both simple strings and hashes
+    def normalize_hosts(hosts)
+      hosts.map do |h|
+        if h.is_a?(Hash)
+          {
+            host: h['host'],
+            private_ip: h['private_ip'],
+            label: h['label']
+          }
+        else
+          { host: h.to_s, private_ip: nil, label: nil }
+        end
+      end
+    end
+
+    # Get connection IP - prefer private_ip if available
+    def connection_ip(host_entry)
+      ip = host_entry[:private_ip].to_s.strip
+      ip.empty? ? host_entry[:host] : ip
+    end
+  end
+end

data/lib/boring_services/services/redis.rb

@@ -33,9 +33,10 @@ module BoringServices
         memory = memory_mb || 256
         listen_port = port || 6379
         password = resolve_secret('redis_password') if config.secrets['redis_password']
+        bind_address = private_ip.to_s.strip.empty? ? "0.0.0.0" : "127.0.0.1 #{private_ip}"
 
         config_content = <<~REDIS
-          bind 0.0.0.0
+          bind #{bind_address}
           port #{listen_port}
           dir /var/lib/redis
           maxmemory #{memory}mb

data/lib/boring_services/version.rb

@@ -1,3 +1,3 @@
 module BoringServices
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/boring_services.rb

@@ -5,6 +5,7 @@ require_relative 'boring_services/cli'
 require_relative 'boring_services/installer'
 require_relative 'boring_services/ssh_executor'
 require_relative 'boring_services/health_checker'
+require_relative 'boring_services/service_locator'
 
 require_relative 'boring_services/services/base'
 require_relative 'boring_services/services/memcached'
@@ -15,14 +16,68 @@ require_relative 'boring_services/services/nginx'
 module BoringServices
   class Error < StandardError; end
 
-  def self.root
-    File.expand_path('..', __dir__)
-  end
+  class << self
+    def root
+      File.expand_path('..', __dir__)
+    end
+
+    def status
+      config = Configuration.load
+      health_checker = HealthChecker.new(config)
+      health_checker.check_all
+    end
+
+    # Service locator instance (cached)
+    def locator
+      @locator ||= ServiceLocator.new
+    end
+
+    # Reset cached locator (useful for testing or config reload)
+    def reset_locator!
+      @locator = nil
+    end
+
+    # Convenience methods - delegate to locator
+
+    # Get Redis host for a region (e.g., "eu", "us")
+    def redis_host(region = nil)
+      region ? locator.host_for_region('redis', region) : locator.primary_host('redis')
+    end
+
+    # Get Redis port
+    def redis_port
+      locator.port_for('redis') || 6379
+    end
+
+    # Build Redis URL
+    def redis_url(region: nil, password: nil, db: 0)
+      locator.redis_url(region: region, password: password, db: db)
+    end
+
+    # Get Memcached host for a region
+    def memcached_host(region = nil)
+      region ? locator.host_for_region('memcached', region) : locator.primary_host('memcached')
+    end
+
+    # Get Memcached port
+    def memcached_port
+      locator.port_for('memcached') || 11211
+    end
+
+    # Get Memcached servers string (host:port,host:port)
+    def memcached_servers(region: nil)
+      locator.memcached_servers(region: region)
+    end
+
+    # Generic: get host for any service by region
+    def host_for(service, region = nil)
+      region ? locator.host_for_region(service, region) : locator.primary_host(service)
+    end
 
-  def self.status
-    config = Configuration.load
-    health_checker = HealthChecker.new(config)
-    health_checker.check_all
+    # Generic: get port for any service
+    def port_for(service)
+      locator.port_for(service)
+    end
   end
 end
 require 'stringio'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boring_services
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - BoringCache
@@ -127,6 +127,7 @@ files:
 - lib/boring_services/installer.rb
 - lib/boring_services/railtie.rb
 - lib/boring_services/secrets.rb
+- lib/boring_services/service_locator.rb
 - lib/boring_services/services/base.rb
 - lib/boring_services/services/haproxy.rb
 - lib/boring_services/services/memcached.rb