consul_syncer 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6354e9ee4ccdf46a22fd97263f8008da145c27a92ff766b501b15f8431303585
-  data.tar.gz: a93e69e00dbcba1cb4d7ee4f5ab4f0fe7cd32ec1e8d3521ca6e11c6278868675
+  metadata.gz: 875c3e3eee8a06872dde88a612d7dfb8ae33ac59377d441e54afa6585da787b7
+  data.tar.gz: 4e1d1d3701fc464772745858109ff04260b0a8568e7ce8ad8eeab6ad6de26032
 SHA512:
-  metadata.gz: 87b9d3375f8e6aa9ce4e7f7055117ddc2e743b86e410f2367ab748ed3795e0f48a763a4b620e40fe703fab7b250a99d2855016c2d2e4170244061ef7aa54b2dc
-  data.tar.gz: a53abb227735ead7f9c0d7f44a95c856cbce43a6e346f40a0977ed4feaad22caa76c9342888d6d135fa99722fd508c30e0743fd44dea426fd1dd35e5200a4c48
+  metadata.gz: ae7f93e5464309a3ed828ba18e7f43bd8ff2ec8a111b513d225f598d2a84c6df80c480722d3f1545a7813c2a34fbf5de10083357432d6f3f9336bf4923a9f082
+  data.tar.gz: 3cdeb2e0566669014aa37ae01cebcb453593e993cf9cee5a4155d26649fddb8f5ca38e179cd911979824c08a5fa98d23345bf441c5b2eb8e5937001263aedba0

data/lib/consul_syncer/version.rb

@@ -1,3 +1,3 @@
 class ConsulSyncer
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/lib/consul_syncer.rb

@@ -17,16 +17,21 @@ class ConsulSyncer
 
   # changing tags means all previous services need to be removed manually since
   # they can no longer be found
-  def sync(expected_definitions, tags)
-    raise ArgumentError, "Need at least 1 tag to reliably update endpoints" if tags.empty?
+  def sync(expected_definitions, tags, dry: false)
+    planned = plan(expected_definitions, tags)
+    execute planned unless dry
+    planned.size # let users know what we did and keep legacy api working
+  end
 
-    modified = 0
+  def plan(expected_definitions, tags)
+    raise ArgumentError, "Need at least 1 tag to reliably update endpoints" if tags.empty?
 
     # ensure consistent tags to find the endpoints after adding
     expected_definitions = expected_definitions.dup
     expected_definitions.each do |d|
       d[:tags] += tags
       d[:tags].sort!
+      d[:tags].uniq!
     end
 
     actual_definitions = consul_endpoints(tags).map do |consul_endpoint|
@@ -43,6 +48,7 @@ class ConsulSyncer
 
     identifying = [:node, :service_id]
     interesting = [*identifying, :service, :service_address, :address, :tags, :port]
+    planned = []
 
     expected_definitions.each do |expected|
       description = "#{expected[:service] || "*"} / #{expected[:service_id] || "*"} on #{expected.fetch(:node)} in Consul"
@@ -59,23 +65,30 @@ class ConsulSyncer
         @logger.debug "Found #{description}"
       elsif remove_matching_service!(actual_definitions, expected, identifying)
         @logger.info "Updating #{description}"
-        modified += 1
-        register expected
+        planned << [:register, [], expected]
       else
         @logger.info "Adding #{description}"
-        modified += 1
-        register expected
+        planned << [:register, [], expected]
       end
     end
 
     # all definitions that are left did not match any expected definitions and are no longer needed
     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)
+      planned << [:deregister, [actual.fetch(:node), actual.fetch(:service_id)], nil]
     end
 
-    modified
+    planned
+  end
+
+  def execute(planned)
+    planned.each do |m, args, kwargs|
+      if kwargs
+        send m, *args, **kwargs
+      else
+        send m, *args
+      end
+    end
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_syncer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -47,14 +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: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Sync remote services into consul