consul_syncer 0.5.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2618a879de065213c36e30009a88e0cac3122bc2
-  data.tar.gz: 72ab3f1f2c69f0a7a5f0a7c02eb9c7f6c67c35e3
+SHA256:
+  metadata.gz: bb9445e925d6b0268c3449351cd3bfc56c51d767238265382e80e7bfc0cd3ee9
+  data.tar.gz: 436992e07cc03d4f2eac53a93be937a48a1308bfc5aaa0d7e5a70f28d97b0782
 SHA512:
-  metadata.gz: cbd1382d959415d7df8b1879221557809b9ee7a05227dfe6a369fb323b05beede32d2c542b99cacbb4eff9fc688edcad0e8b328af3e5e7ec017835e12e20e04f
-  data.tar.gz: 178f0dd62685e2610b8b17928fef903968e82a4224b62556b3a3ee8d61f20b2d4689e7badb1dfa005c57f3add19ca2a02eb0376b2661fad764011bfc716f198b
+  metadata.gz: 02b2761bf351a62609de73be6e7e3ba250bbffef95e86806757f1ed24b7db9cadb22cb16322787d6856ac91c21ed6c95d8bb342c049da2f557e408f1023dc918
+  data.tar.gz: 9da6e8093bd5c99a4c683fa61e75b76748051e9173d3a4057a2ed52d07c8b06c8f51f3312ba358d78f5f62bea8aa2826566bb99e13aa800fccee3fadd30b2a4a

data/lib/consul_syncer.rb

@@ -5,13 +5,14 @@ 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
@@ -44,18 +45,26 @@ class ConsulSyncer
     interesting = [*identifying, :service, :service_address, :address, :tags, :port]
 
     expected_definitions.each do |expected|
-      description = "#{expected.fetch(:service)} / #{expected.fetch(:service_id)} on #{expected.fetch(:node)} in Consul"
-
-      if remove_matching_service!(actual_definitions, expected, interesting)
+      description = "#{expected[:service] || "*"} / #{expected[:service_id] || "*"} on #{expected.fetch(:node)} in Consul"
+
+      if expected[:keep]
+        keep_identifying = identifying.dup
+        keep_identifying.delete(:service_id) unless expected[:service_id]
+        if remove_matching_service!(actual_definitions, expected, keep_identifying)
+          @logger.warn "Kept #{description}"
+        else
+          @logger.error "Unable to keep #{description} since it was not found"
+        end
+      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
+        register **expected
       else
         @logger.info "Adding #{description}"
         modified += 1
-        register expected
+        register **expected
       end
     end
 
@@ -72,7 +81,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.5.0"
+  VERSION = "1.0.1"
 end

data/lib/consul_syncer/wrapper.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # - parses json responses
 # - fails with descriptive output when a request fails
+
+require 'json'
+
 class ConsulSyncer
   class Wrapper
     BACKOFF = [0.1, 0.5, 1.0, 2.0].freeze
@@ -8,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.5.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2020-05-27 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.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Sync remote services into consul