consul_syncer 0.6.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62318b7ff11cb47fbcf16d8517e94680743ccbb2f49601ecf5ac2acd5556d096
-  data.tar.gz: d0cf1cbd28f2e7bb21d3ead832171ab3bd18f65000f10bac54326be427dac9e1
+  metadata.gz: 59b87094f77b404c59b018035020eab02be5075c3b3d9dc3e68f28a64d8f70c0
+  data.tar.gz: c61781655c3a8a67e266da1e97578b9e996d7c4b43248c777ef43e35608ba8ff
 SHA512:
-  metadata.gz: 300ae25519fc5e00460750324613dc883e0b1b9eec3223a3a2d4f8ac5be5e73414500bebdfc6fed9f70e6fb5e09bef67641c9f8fc52a855f5e830a96edbe1063
-  data.tar.gz: 6a8310a1fbe7dcf69fdb4f3712aae357f97328faa2056d44245e1b05997ca8ab41849c111aeff9512244c3093342794a1fcba342b6c2b9188ebc3ed1cddbe7dd
+  metadata.gz: 4f164174999daa718fe237edbff4a0b1ca3389ab56db5af2ce57cfd7876c20b0d5563de016b649677e0bd14b3d7e7c544c8857a27bb271eae1291fe6a43f02da
+  data.tar.gz: bfd88ffae1281a70b942fb6f766fbabcc20f4ec49aca1df311a5cf79e4f6c08dc4dbd13f77110b8f38be4260e3e7a4daba8431d5996279739f475d1d0a71de6f

data/lib/consul_syncer.rb

@@ -5,18 +5,19 @@ require 'consul_syncer/endpoint'
 require 'consul_syncer/wrapper'
 
 # syncs a given list of endpoints into consul
+# - sorts tags
 # - adds missing
 # - updates changed
 # - removes deprecated
 class ConsulSyncer
   def initialize(url, logger: Logger.new(STDOUT), params: {})
     @logger = logger
-    @consul = Wrapper.new(Faraday.new(url), params: params, logger: @logger)
+    @consul = Wrapper.new(url, params: params, logger: @logger)
   end
 
   # changing tags means all previous services need to be removed manually since
   # they can no longer be found
-  def sync(expected_definitions, tags)
+  def sync(expected_definitions, tags, dry: false)
     raise ArgumentError, "Need at least 1 tag to reliably update endpoints" if tags.empty?
 
     modified = 0
@@ -26,6 +27,7 @@ class ConsulSyncer
     expected_definitions.each do |d|
       d[:tags] += tags
       d[:tags].sort!
+      d[:tags].uniq!
     end
 
     actual_definitions = consul_endpoints(tags).map do |consul_endpoint|
@@ -59,11 +61,11 @@ class ConsulSyncer
       elsif remove_matching_service!(actual_definitions, expected, identifying)
         @logger.info "Updating #{description}"
         modified += 1
-        register expected
+        register **expected unless dry
       else
         @logger.info "Adding #{description}"
         modified += 1
-        register expected
+        register **expected unless dry
       end
     end
 
@@ -71,7 +73,7 @@ class ConsulSyncer
     actual_definitions.each do |actual|
       @logger.info "Removing #{actual.fetch(:service)} / #{actual.fetch(:service_id)} on #{actual.fetch(:node)} in Consul"
       modified += 1
-      deregister actual.fetch(:node), actual.fetch(:service_id)
+      deregister actual.fetch(:node), actual.fetch(:service_id) unless dry
     end
 
     modified
@@ -80,7 +82,7 @@ class ConsulSyncer
   private
 
   def consul_endpoints(requested_tags)
-    services = @consul.request(:get, "/v1/catalog/services?tag=#{requested_tags.first}")
+    services = @consul.request(:get, "/v1/catalog/services?cached&stale&tag=#{requested_tags.first}")
     services.each_with_object([]) do |(name, tags), all|
       # cannot query for multiple tags via query, so handle multi-matching manually
       next if (requested_tags - tags).any?

data/lib/consul_syncer/version.rb

@@ -1,3 +1,3 @@
 class ConsulSyncer
-  VERSION = "0.6.1"
+  VERSION = "1.1.0"
 end

data/lib/consul_syncer/wrapper.rb

@@ -11,8 +11,9 @@ class ConsulSyncer
     class ConsulError < StandardError
     end
 
-    def initialize(consul, params:, logger:)
-      @consul = consul
+    def initialize(consul_url, params:, logger:)
+      consul_url = "http://#{consul_url}" unless consul_url.include?("://")
+      @consul = Faraday.new(consul_url)
       @params = params
       @logger = logger
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_syncer
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -47,15 +47,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Sync remote services into consul