boring_services 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156bb67ea987370602ed678f3d8a525f6eeae09dcbc2a3ae8ac23fa85b474ca4
-  data.tar.gz: 8ce1325011cac932711b77afed6a5d0307bebedaa4e52fc2b65d9a153daf2e91
+  metadata.gz: a1e8cb457318dbccb953374f554aa4fcb5c1bf72434d952bd5db807ce9bf8909
+  data.tar.gz: 85efc2d725d4c42bfceecc6090c79b670d9ed8fe1db06afb6e72626a00030712
 SHA512:
-  metadata.gz: 72bf5746276b30243a9b75b8091491afd3e58e5e8feac6b3a8f62bc7cafa8f9088d6d1f279f075b6f3f77d0f350017a4bf277e18a3ef4844d273293fb2f3b363
-  data.tar.gz: 07ac07fe8b309a06ff23ca77a7681aab03c77d8ecc0fac5e86e6723c999eb05976827e2bafdd072f7dfc0eef700c731329402a627b6ab64d2492983aaf6d125f
+  metadata.gz: e41e8e1f47c453e2ef0627f988f087f03fd2a184a56b91f2f8be84e6c34c02ff7c6cc9d0bc8f01803102932e52e5947384c5a6ccf2a19a2d372fa7fa1ef3af80
+  data.tar.gz: 155d156c9aafe05ac0e67d3d1a419f77077514c3a1ab7cffdaed81f3e87abef71a139f8b0bba00b7efcdf1411dc4dba41361ac389431f9e80e0d4f1ec80d95af

data/lib/boring_services/service_locator.rb

@@ -11,40 +11,31 @@ module BoringServices
     # 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
+      services = config.services.select { |s| s['name'] == service_name.to_s }
+      return [] if services.empty?
 
-      normalize_hosts(service['hosts'] || [])
+      services.flat_map { |service| normalize_service_hosts(service) }
     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?
-
+    # Get host by exact label match
+    def host_by_label(service_name, label)
       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
-
+      host_entry = hosts.find { |h| h[:label] == label.to_s }
       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)
+    # Get all hosts as a hash keyed by label
+    # { "redis-eu-gcp" => "10.8.0.10", "redis-us-aws" => "10.8.0.60" }
+    def hosts_by_label(service_name)
+      hosts_for(service_name).each_with_object({}) do |h, hash|
+        hash[h[:label]] = connection_ip(h) if h[:label]
+      end
     end
 
     # Get all connection IPs for a service (prefers private_ip for each)
-    def all_hosts(service_name)
+    def all_ips(service_name)
       hosts_for(service_name).map { |h| connection_ip(h) }
     end
 
@@ -54,9 +45,9 @@ module BoringServices
       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')
+    # Build a Redis URL for a specific label
+    def redis_url(label: nil, password: nil, db: 0)
+      host = label ? host_by_label('redis', label) : all_ips('redis').first
       return nil unless host
 
       port = port_for('redis') || 6379
@@ -65,12 +56,12 @@ module BoringServices
     end
 
     # Build memcached connection string (host:port,host:port format)
-    def memcached_servers(region: nil)
-      hosts = if region
-                host = host_for_region('memcached', region)
+    def memcached_servers(label: nil)
+      hosts = if label
+                host = host_by_label('memcached', label)
                 host ? [host] : []
               else
-                all_hosts('memcached')
+                all_ips('memcached')
               end
 
       return nil if hosts.empty?
@@ -81,8 +72,20 @@ module BoringServices
 
     private
 
-    # Normalize hosts array - handles both simple strings and hashes
-    def normalize_hosts(hosts)
+    # Normalize hosts from a service config
+    # Handles: single host:, array hosts:, or hosts: as array of hashes
+    def normalize_service_hosts(service)
+      # Single host entry (production style)
+      if service['host']
+        return [{
+          host: service['host'],
+          private_ip: service['private_ip'],
+          label: service['label']
+        }]
+      end
+
+      # Array of hosts
+      hosts = service['hosts'] || []
       hosts.map do |h|
         if h.is_a?(Hash)
           {

data/lib/boring_services/services/redis.rb

@@ -33,7 +33,8 @@ 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}"
+        has_private_ip = !private_ip.to_s.strip.empty?
+        bind_address = has_private_ip ? "127.0.0.1 #{private_ip}" : "0.0.0.0"
 
         config_content = <<~REDIS
           bind #{bind_address}
@@ -52,10 +53,29 @@ module BoringServices
         execute :sudo, :chown, 'redis:redis', '/etc/redis/redis.conf'
         execute :sudo, :chmod, '640', '/etc/redis/redis.conf'
 
+        # If using private IP (WireGuard), ensure Redis starts after WireGuard
+        if has_private_ip
+          configure_wireguard_dependency
+        end
+
         # Set vm.overcommit_memory for Redis background saves
         execute :sudo, :sysctl, '-w', 'vm.overcommit_memory=1'
         execute "echo 'vm.overcommit_memory = 1' | sudo tee -a /etc/sysctl.conf > /dev/null || true"
       end
+
+      def configure_wireguard_dependency
+        override_dir = '/etc/systemd/system/redis-server.service.d'
+        override_content = <<~SYSTEMD
+          [Unit]
+          After=wg-quick@wg0.service
+          Wants=wg-quick@wg0.service
+        SYSTEMD
+
+        execute :sudo, :mkdir, '-p', override_dir
+        upload! StringIO.new(override_content), '/tmp/wireguard-dependency.conf'
+        execute :sudo, :mv, '/tmp/wireguard-dependency.conf', "#{override_dir}/wireguard.conf"
+        execute :sudo, :systemctl, 'daemon-reload'
+      end
     end
   end
 end

data/lib/boring_services/version.rb

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

data/lib/boring_services.rb

@@ -39,9 +39,14 @@ module BoringServices
 
     # 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')
+    # Get all Redis hosts as hash { label => private_ip }
+    def redis_hosts
+      locator.hosts_by_label('redis')
+    end
+
+    # Get Redis host by exact label
+    def redis_host(label)
+      locator.host_by_label('redis', label)
     end
 
     # Get Redis port
@@ -49,14 +54,19 @@ module BoringServices
       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)
+    # Build Redis URL for a label
+    def redis_url(label: nil, password: nil, db: 0)
+      locator.redis_url(label: label, password: password, db: db)
+    end
+
+    # Get all Memcached hosts as hash { label => private_ip }
+    def memcached_hosts
+      locator.hosts_by_label('memcached')
     end
 
-    # Get Memcached host for a region
-    def memcached_host(region = nil)
-      region ? locator.host_for_region('memcached', region) : locator.primary_host('memcached')
+    # Get Memcached host by exact label
+    def memcached_host(label)
+      locator.host_by_label('memcached', label)
     end
 
     # Get Memcached port
@@ -65,13 +75,18 @@ module BoringServices
     end
 
     # Get Memcached servers string (host:port,host:port)
-    def memcached_servers(region: nil)
-      locator.memcached_servers(region: region)
+    def memcached_servers(label: nil)
+      locator.memcached_servers(label: label)
+    end
+
+    # Generic: get all hosts for any service as hash { label => ip }
+    def hosts_for(service)
+      locator.hosts_by_label(service)
     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)
+    # Generic: get host by exact label for any service
+    def host_for(service, label)
+      locator.host_by_label(service, label)
     end
 
     # Generic: get port for any service

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boring_services
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - BoringCache