etcd-discovery 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3453532202e1683980506e000b3e4b6ec564f4d1da1aba5fe43e4ad6976b1658
-  data.tar.gz: 4cdbc6f516d3419476f5fab91a42ceb0b8611c925edfad3843a7af8e3a48b89e
+  metadata.gz: 02edd48044abeca02169d432516a65ea48c8843b22942686c88f4c9761fd10f4
+  data.tar.gz: a3c0768508b0043521b98017d71442261e17fd63f7d4cd8c7c5f0e05ece91203
 SHA512:
-  metadata.gz: 9474e53f69a98deb4b570c0f89c1811cb363bb2630430a02823833b61d72aafd01b084e5b7165b703483dd1a462d3eb365c7ec30ffec9745e741104c989dd3a1
-  data.tar.gz: 11427a5f9737d2110d3e82dc5febcc33e5573f6f4bd7f0bc89367b4e450c43a668abcda881dea6435c8a1422102925b7107ceeb8dd0f841a1eea5c168ca8435b
+  metadata.gz: 573344b8a4f8de0222d0da6e38ef5dddfe8f67d55585c26d66edd44345dbd3adb27f25c4e911fe15bba2f3be711d8db5d4374dc3cdd189ebdc8495f8c0cf51cd
+  data.tar.gz: 7620dff391769b07332e7e8608098b734f4285f794ee670dafe1e4dd45607c21d3cc1c5f2ec54b4ea9fd4eaa9c8478ddb7285a8156653b985c86ac49f68cd7e3

data/lib/etcd-discovery/host.rb

@@ -25,16 +25,16 @@ module EtcdDiscovery
     end
 
     def to_uri(schemes = ["https", "http"])
-      a = attributes # Shorten name
-      schemes = [schemes] if !schemes.is_a?(Array)
-      scheme = schemes.find { |s|
-        !a["ports"][s].nil?
-      }
-      if a["user"].empty?
-        URI("#{scheme}://#{a["name"]}:#{a["ports"][scheme]}")
-      else
-        URI("#{scheme}://#{a["user"]}:#{a["password"]}@#{a["name"]}:#{a["ports"][scheme]}")
+      schemes = Array(schemes)
+
+      scheme = schemes.find { |s| attributes["ports"][s] }
+      raise "No valid scheme found" unless scheme
+
+      if attributes["user"].nil? || attributes["user"].empty?
+        return URI("#{scheme}://#{attributes["name"]}:#{attributes["ports"][scheme]}")
       end
+
+      URI("#{scheme}://#{attributes["user"]}:#{attributes["password"]}@#{attributes["name"]}:#{attributes["ports"][scheme]}")
     end
 
     def to_private_uri(schemes = ["https", "http"])
@@ -60,7 +60,12 @@ module EtcdDiscovery
     end
 
     def to_s
-      to_uri.to_s
+      uri = to_uri
+      if uri.userinfo
+        user, _password = uri.userinfo.split(":", 2)
+        uri.userinfo = "#{user}:REDACTED"
+      end
+      uri.to_s
     end
   end
 end

data/lib/etcd-discovery/service.rb

@@ -43,22 +43,27 @@ module EtcdDiscovery
     end
 
     def to_uri(schemes = ["https", "http"])
-      a = attributes
-      return one.to_uri(schemes) unless a["public"]
+      schemes = Array(schemes)
 
-      schemes = [schemes] if !schemes.is_a?(Array)
-      scheme = schemes.reject do |s|
-        a["ports"][s].nil?
-      end.first
-      if a["user"].nil? || a["user"] == ""
-        URI("#{scheme}://#{a["hostname"]}:#{a["ports"][scheme]}")
-      else
-        URI("#{scheme}://#{a["user"]}:#{a["password"]}@#{a["hostname"]}:#{a["ports"][scheme]}")
+      return one.to_uri(schemes) unless attributes["public"]
+
+      scheme = schemes.find { |s| attributes["ports"][s] }
+      raise "No valid scheme found" unless scheme
+
+      if attributes["user"].nil? || attributes["user"].empty?
+        return URI("#{scheme}://#{attributes["hostname"]}:#{attributes["ports"][scheme]}")
       end
+
+      URI("#{scheme}://#{attributes["user"]}:#{attributes["password"]}@#{attributes["hostname"]}:#{attributes["ports"][scheme]}")
     end
 
     def to_s
-      to_uri.to_s
+      uri = to_uri
+      if uri.userinfo
+        user, _password = uri.userinfo.split(":", 2)
+        uri.userinfo = "#{user}:REDACTED"
+      end
+      uri.to_s
     end
 
     def to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-discovery
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Léo Unbekandt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -43,7 +43,7 @@ homepage: http://github.com/Scalingo/etcd-discovery-ruby
 licenses:
 - BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +58,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Service discovery based on etcd
 test_files: []