consul_syncer 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb9445e925d6b0268c3449351cd3bfc56c51d767238265382e80e7bfc0cd3ee9
-  data.tar.gz: 436992e07cc03d4f2eac53a93be937a48a1308bfc5aaa0d7e5a70f28d97b0782
+  metadata.gz: 0b2bef9d0c04323f933176da717b088e7179d8c1654bad10a5c91d1e83f957fb
+  data.tar.gz: 25ecfe6ce76a967aefdb2d89fd82137664a418848587645a29fc1346fc95165a
 SHA512:
-  metadata.gz: 02b2761bf351a62609de73be6e7e3ba250bbffef95e86806757f1ed24b7db9cadb22cb16322787d6856ac91c21ed6c95d8bb342c049da2f557e408f1023dc918
-  data.tar.gz: 9da6e8093bd5c99a4c683fa61e75b76748051e9173d3a4057a2ed52d07c8b06c8f51f3312ba358d78f5f62bea8aa2826566bb99e13aa800fccee3fadd30b2a4a
+  metadata.gz: 42d34c44dc46d220efff7759e423aa3c2e62ed69e9a63e91fc342111f09ed14ba073798be9edb22c956c3e8007cb0746105c144dedac5bdb1cca0b2a27e94653
+  data.tar.gz: 32eeeb25cb89d0f20802abc6a61cf9437bc8f6c44158fc5c84999cca42eb0f4761bfeaf1a97a9062d9ceedadc7588186c3f82e6fe97688138ff4032f1ad04107

data/lib/consul_syncer/version.rb

@@ -1,3 +1,3 @@
 class ConsulSyncer
-  VERSION = "1.0.1"
+  VERSION = "1.2.1"
 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"
@@ -58,24 +64,23 @@ class ConsulSyncer
       elsif remove_matching_service!(actual_definitions, expected, interesting)
         @logger.debug "Found #{description}"
       elsif remove_matching_service!(actual_definitions, expected, identifying)
-        @logger.info "Updating #{description}"
-        modified += 1
-        register **expected
+        planned << [:register, [], expected.merge(reason: "Updating #{description}")]
       else
-        @logger.info "Adding #{description}"
-        modified += 1
-        register **expected
+        planned << [:register, [], expected.merge(reason: "Adding #{description}")]
       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)
+      reason = "Removing #{actual.fetch(:service)} / #{actual.fetch(:service_id)} on #{actual.fetch(:node)} in Consul"
+      planned << [:deregister, [actual.fetch(:node), actual.fetch(:service_id)], {reason: reason}]
     end
 
-    modified
+    planned
+  end
+
+  def execute(planned)
+    planned.each { |m, args, kwargs| send m, *args, **kwargs }
   end
 
   private
@@ -103,7 +108,8 @@ class ConsulSyncer
   end
 
   # creates or updates based on node and service
-  def register(node:, service:, service_id:, service_address:, address:, tags:, port:)
+  def register(node:, service:, service_id:, service_address:, address:, tags:, port:, reason:)
+    @logger.info reason
     @consul.request(
       :put,
       '/v1/catalog/register',
@@ -119,7 +125,8 @@ class ConsulSyncer
     )
   end
 
-  def deregister(node, service_id)
+  def deregister(node, service_id, reason:)
+    @logger.info reason
     @consul.request(
       :put,
       '/v1/catalog/deregister',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_syncer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Sync remote services into consul