consul_syncer 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b83e20565f0858e1918b7ca93c1c6d41c9a2b2777a32937bb5169345175142
-  data.tar.gz: bf0ff33dd92696b851ca21537dd53bf7b06b8076572418149f91e47d34f8921d
+  metadata.gz: bf3d5a6f2bfd0484e3290d7483ea078d8eafcd66e8a177149af746b63f40e812
+  data.tar.gz: 26c0ade8975a7a84f8c28662c5052795699dfa3d54680c060961f169f1b1adbf
 SHA512:
-  metadata.gz: 35f338525c66aea26f700d3b6931ab05676acb24e711428858326b237cf73f1d8874fadb95f51a2eabb0b9a085bf21c1192cae1bbc7f8113e2cf03173e5572c0
-  data.tar.gz: e41f084b247a579ca030419c1f01b1695829291cd63b6b1feedd0af3822f22f3974a2101ac46c68b062f1fd54340b8cd5e8a1a6425beaa0f285b6a55946aecf4
+  metadata.gz: c828440bd91ee16d46f7d887672daa024d741125ca36e58d224a94abaa512b7cf6bc7ef38c69c52d4dc1a9b26f31d65952c66e5dc6504a86100d1f6670b989a7
+  data.tar.gz: e7f25d5fcdc072aaa4476502003eaba6019580da7ed3fade69011a8f178e6bb3a43374a16184e359308bcde983ac1d2b650d90b396eee3a0e5a8956d9e416b0d

data/lib/consul_syncer/version.rb

@@ -1,3 +1,3 @@
 class ConsulSyncer
-  VERSION = "1.2.2"
+  VERSION = "2.0.0"
 end

data/lib/consul_syncer/wrapper.rb

@@ -13,7 +13,9 @@ class ConsulSyncer
 
     def initialize(consul_url, params:, logger:)
       consul_url = "http://#{consul_url}" unless consul_url.include?("://")
-      @consul = Faraday.new(consul_url)
+      @consul = Faraday.new(consul_url) do |f|
+        f.request :json
+      end
       @params = params
       @logger = logger
     end
@@ -24,7 +26,7 @@ class ConsulSyncer
         path += "#{separator}#{URI.encode_www_form(@params)}"
       end
       args = [path]
-      args << payload.to_json if payload
+      args << payload if payload
 
       retry_on_error do
         response = @consul.send(method, *args)

data/lib/consul_syncer.rb

@@ -10,24 +10,23 @@ require 'consul_syncer/wrapper'
 # - updates changed
 # - removes deprecated
 class ConsulSyncer
-  def initialize(url, logger: Logger.new(STDOUT), params: {})
+  def initialize(url, logger: Logger.new(STDOUT), params: {}, services_params: nil)
     @logger = logger
     @consul = Wrapper.new(url, params: params, logger: @logger)
+    @services_params = services_params
   end
 
   # 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)
-    planned = plan(expected_definitions, tags)
-    execute planned unless dry
-    planned.size # let users know what we did and keep legacy api working
+  def sync(expected_definitions, tags)
+    execute plan(expected_definitions, tags)
   end
 
   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 = expected_definitions.map(&:dup)
     expected_definitions.each do |d|
       d[:tags] += tags
       d[:tags].sort!
@@ -86,7 +85,9 @@ class ConsulSyncer
   private
 
   def consul_endpoints(requested_tags)
-    services = @consul.request(:get, "/v1/catalog/services?cached&stale")
+    path = "/v1/catalog/services"
+    path += "?#{@services_params}" if @services_params
+    services = @consul.request(:get, path)
     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?

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: consul_syncer
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,7 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email: michael@grosser.it
 executables: []
 extensions: []
@@ -39,7 +37,6 @@ homepage: https://github.com/grosser/consul_syncer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -47,15 +44,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Sync remote services into consul
 test_files: []