etcd-discovery 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02edd48044abeca02169d432516a65ea48c8843b22942686c88f4c9761fd10f4
-  data.tar.gz: a3c0768508b0043521b98017d71442261e17fd63f7d4cd8c7c5f0e05ece91203
+  metadata.gz: ee7722bd7f4ac071e3867e8f375f8d409dcfd3b0fe348c948c4d0720b4bc968d
+  data.tar.gz: f165f293b2f512a626d272498a27cafc2e31881fa293f9066c2c60293d17b529
 SHA512:
-  metadata.gz: 573344b8a4f8de0222d0da6e38ef5dddfe8f67d55585c26d66edd44345dbd3adb27f25c4e911fe15bba2f3be711d8db5d4374dc3cdd189ebdc8495f8c0cf51cd
-  data.tar.gz: 7620dff391769b07332e7e8608098b734f4285f794ee670dafe1e4dd45607c21d3cc1c5f2ec54b4ea9fd4eaa9c8478ddb7285a8156653b985c86ac49f68cd7e3
+  metadata.gz: 190cc1df8b425c188f37a8f5630d7bb6f86861dab222403266233d75be8b842b64a1e582d410f03b0253e19d8ef32c9d742076c703bf58fb98350eb4ba5df89f
+  data.tar.gz: d72483c7cb1449997e30261b76754c8a5df7953f8a89d3a24465e013df6a859132c5841b21104269b5bafcafcb670d1c3e2198fd512145613e3547b9d76b658e

data/lib/etcd-discovery/service.rb

@@ -3,9 +3,9 @@ module EtcdDiscovery
   end
 
   class Service
-    attr_accessor :attributes
+    attr_accessor :attributes, :shard
 
-    def initialize(arg)
+    def initialize(arg, shard = nil)
       if arg.is_a? Etcd::Node
         @attributes = JSON.parse arg.value
       elsif arg.is_a? Hash
@@ -13,39 +13,55 @@ module EtcdDiscovery
       else
         raise TypeError, "requires a Etcd::Node or a Hash, not a #{arg.class}"
       end
+      @shard = shard
     end
 
-    def self.get(service)
+    def self.get(service, shard: nil)
       raise TypeError, "service should be a String, is a #{service.class}" unless service.is_a? String
 
       client = EtcdDiscovery.config.client
       begin
         service = client.get("/services_infos/#{service}")
-        new service.node
+        new(service.node, shard)
       rescue Etcd::KeyNotFound
-        new("name" => service)
+        new({"name" => service}, shard)
       end
     end
 
     def all
       client = EtcdDiscovery.config.client
+
       begin
         node = client.get("/services/#{attributes["name"]}", recursive: true).node
       rescue Etcd::KeyNotFound
         raise ServiceNotFound, attributes["name"]
       end
+
       raise ServiceNotFound, attributes["name"] if node.children.empty?
-      node.children.map { |c| Host.new(c) }
+
+      hosts = node.children.map { |c| Host.new(c) }
+      return hosts if @shard.nil?
+
+      hosts = hosts.select { |host| host.attributes["shard"].to_s == @shard.to_s }
+      raise ServiceNotFound, attributes["name"] if hosts.empty?
+
+      hosts
     end
 
     def one
       all.sample
     end
 
-    def to_uri(schemes = ["https", "http"])
+    def to_uri(schemes = ["https", "http"], **kwargs)
+      unless kwargs.empty?
+        raise TypeError, "to_uri does not accept keyword arguments; pass schemes as a String or an Array"
+      end
+
+      raise TypeError, "schemes should be a String or an Array" if schemes.is_a? Hash
+
       schemes = Array(schemes)
 
-      return one.to_uri(schemes) unless attributes["public"]
+      return one.to_uri(schemes) if @shard || !attributes["public"]
 
       scheme = schemes.find { |s| attributes["ports"][s] }
       raise "No valid scheme found" unless scheme

data/lib/etcd-discovery.rb

@@ -1,8 +1,8 @@
 ## Require files from etcd-discovery
 
+require "logger"
 require "etcd"
 require "json"
-require "logger"
 
 dir = File.join File.dirname(__FILE__), "etcd-discovery"
 Dir["#{dir}/*.rb"].sort.each do |file|
@@ -22,8 +22,8 @@ module EtcdDiscovery
   end
 
   # For a cleaner API
-  def self.get(service)
-    Service.get(service)
+  def self.get(service, shard: nil)
+    Service.get(service, shard: shard)
   end
 
   def self.register(service, host)

data/spec/etcd-discovery/registrar_spec.rb

@@ -10,6 +10,19 @@ RSpec.describe EtcdDiscovery::Registrar do
         end
       end
 
+      context "with a sharded Hash" do
+        subject do
+          EtcdDiscovery::Registrar.new(
+            "service",
+            {"name" => "example.com", "ports" => {"http" => 80}, "shard" => "shard-0"}
+          )
+        end
+
+        it "should keep the shard on the host payload" do
+          expect(subject.host.attributes["shard"]).to eq "shard-0"
+        end
+      end
+
       context "with a EtcdDiscovery::Host" do
         subject { EtcdDiscovery::Registrar.new "service", EtcdDiscovery::Host.new({"name" => "example.com", "ports" => {"http" => 80}}) }
         it "should defines the state to new" do

data/spec/spec_helper.rb

@@ -2,14 +2,14 @@ require "etcd-discovery"
 
 require "rubygems"
 require "bundler/setup"
-Bundler.require(:default, :development, :test)
+Bundler.require(:default, :test)
 
 EtcdDiscovery.config.register_renew = 0.1
 
 require "webmock/rspec"
 WebMock.disable_net_connect!(allow_localhost: false)
 
-require_relative "./etcd_helper"
+require_relative "etcd_helper"
 
 RSpec.configure do |config|
   config.include(EtcdHelper)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Léo Unbekandt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2026-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Service discovery based on etcd