consul_syncer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b87094f77b404c59b018035020eab02be5075c3b3d9dc3e68f28a64d8f70c0
-  data.tar.gz: c61781655c3a8a67e266da1e97578b9e996d7c4b43248c777ef43e35608ba8ff
+  metadata.gz: 875c3e3eee8a06872dde88a612d7dfb8ae33ac59377d441e54afa6585da787b7
+  data.tar.gz: 4e1d1d3701fc464772745858109ff04260b0a8568e7ce8ad8eeab6ad6de26032
 SHA512:
-  metadata.gz: 4f164174999daa718fe237edbff4a0b1ca3389ab56db5af2ce57cfd7876c20b0d5563de016b649677e0bd14b3d7e7c544c8857a27bb271eae1291fe6a43f02da
-  data.tar.gz: bfd88ffae1281a70b942fb6f766fbabcc20f4ec49aca1df311a5cf79e4f6c08dc4dbd13f77110b8f38be4260e3e7a4daba8431d5996279739f475d1d0a71de6f
+  metadata.gz: ae7f93e5464309a3ed828ba18e7f43bd8ff2ec8a111b513d225f598d2a84c6df80c480722d3f1545a7813c2a34fbf5de10083357432d6f3f9336bf4923a9f082
+  data.tar.gz: 3cdeb2e0566669014aa37ae01cebcb453593e993cf9cee5a4155d26649fddb8f5ca38e179cd911979824c08a5fa98d23345bf441c5b2eb8e5937001263aedba0

data/lib/consul_syncer/version.rb

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

data/lib/consul_syncer.rb

@@ -18,9 +18,13 @@ 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, dry: false)
-    raise ArgumentError, "Need at least 1 tag to reliably update endpoints" if tags.empty?
+    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
@@ -44,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"
@@ -60,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 unless dry
+        planned << [:register, [], expected]
       else
         @logger.info "Adding #{description}"
-        modified += 1
-        register **expected unless dry
+        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) unless dry
+      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.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday