consul_syncer 0.6.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05054cc82c55d869dc480792ccd4224e500b572da7754c1a8104123523b0f160
-  data.tar.gz: 4b2f5eebed165829d61f827af987f07584f1bce2da2f843f96d01bf1493dcc58
+  metadata.gz: 17887a8798f297f2b6e1483008a2aa02a8f28bdcc4d3ef4d13a4c1ad048a7cae
+  data.tar.gz: e28b77916e2a42c6f51de972c6fe33fa10efd800d35a7263dd750e450b65fb81
 SHA512:
-  metadata.gz: 3ff1ba428af80daaac2ff471460313621b781c77c5a0da7d74e97c762e94929bf5f69885999dda7c1be85f0f4afea78db3d600a0a72f63f6425fbafd74cf5297
-  data.tar.gz: 7317f4d28b1818fe71209d5c82ffbeb1de2f9b09a656ccefa08939950b13edc8cc08176d24b24a95a8eda90fc3b542dd44af9aff7d09e98a29514b7015e9a58a
+  metadata.gz: 0bed1f83c10efedfb49d41e1e70b1b4d41090bdce42e44c74810cded16311c48284e0c4c5991665f3938b4e68ed9b05033dcbe7ebcb6e4425fd3de5ac27903f8
+  data.tar.gz: a8bc5c5c38c77b03390af3724e4182df368793f0e832bea6af73a0bdb041c0b24fe4e9239bf34a573c1e21ca6c1e64a484f0ca007acb42f629c0ab70f5b4b95b

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
@@ -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
       else
         @logger.info "Adding #{description}"
         modified += 1
-        register expected
+        register **expected
       end
     end
 
@@ -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.0"
+  VERSION = "1.0.2"
 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.6.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2021-02-26 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.1.3
 signing_key: 
 specification_version: 4
 summary: Sync remote services into consul