consul-templaterb 1.9.7 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8362a90f73e7dfef755f1daeba28b350b62951f3ddaf795eb3449f6b7f489be6
-  data.tar.gz: 57d7df6ab6061ef40349698d3a7ac8eab02d7f7fbf84a5c22fa9e89e88a72771
+  metadata.gz: 0e7163a9f8ea72026dcc50a91da551a7e7ac27b4d276e3bcf4cbe71f14e2a9d4
+  data.tar.gz: e54468d856039191d377eced8706adae58c50a7c17b3a23c2a52ee2ae18a9481
 SHA512:
-  metadata.gz: d0ebfdef413617a55914847a798123a5541fcec5968e88967fb8919fb9ab0005d7ed2c29972bf5de71cd36764bec6c013fc4943e095f83fde22f4edcfc06a85b
-  data.tar.gz: 5de05990e69ec4c009990728233288b09ea22c32181fe441fbfd11e52c93d831c08ce5be87fd55a0666070e2992a250e55c9f2ac878fb77f800283b61334cbec
+  metadata.gz: 3a56201067ca649e23c8d53370d4134cfb413543400ac5c1cbf615b31d16d7e69b8b9b6578125c1eb0348f2960628aafa29058c690b66893d6ef30328c6f93b9
+  data.tar.gz: 7599a3b441da669a0e43800a2e345f4d7586232d9ea5abd78ab9f2269ba8ceae3f6e219b299fd71f910ed753d387774b487845feeb90bcf67344c96e91f685a3

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## (UNRELEASED)
 
+## 1.9.8 (January 16, 2019)
+
+BUGFIX:
+
+ * When default value was the same as real value, endpoints were always marked as
+   dirty, thus rendering of templates did never succeed.
+   Since default value for service was '[]', trying to fetch a non-existing service
+   did forbid templates to converge.
+
 ## 1.9.7 (January 15, 2019)
 
 IMPROVEMENTS:

data/lib/consul/async/consul_endpoint.rb

@@ -62,7 +62,7 @@ module Consul
     end
     class ConsulResult
       attr_reader :data, :http, :x_consul_index, :last_update, :stats, :retry_in
-      def initialize(data, modified, http, x_consul_index, stats, retry_in)
+      def initialize(data, modified, http, x_consul_index, stats, retry_in, fake: false)
         @data = data
         @modified = modified
         @http = http
@@ -70,6 +70,11 @@ module Consul
         @last_update = Time.now.utc
         @stats = stats
         @retry_in = retry_in
+        @fake = fake
+      end
+
+      def fake?
+        @fake
       end
 
       def modified?
@@ -120,7 +125,7 @@ module Consul
         @query_params = query_params
         @stopping = false
         @stats = EndPointStats.new
-        @last_result = ConsulResult.new(default_value, false, HttpResponse.new(nil), 0, stats, 1)
+        @last_result = ConsulResult.new(default_value, false, HttpResponse.new(nil), 0, stats, 1, fake: true)
         on_response { |result| @stats.on_response result }
         on_error { |http| @stats.on_error http }
         _enable_network_debug if conf.debug && conf.debug[:network]
@@ -228,7 +233,7 @@ module Consul
                               HttpResponse.new(http)
                             end
               new_content = http_result.response.freeze
-              modified = @last_result.nil? ? true : @last_result.data != new_content
+              modified = @last_result.fake? || @last_result.data != new_content
               if n_consul_index == consul_index || n_consul_index.nil?
                 retry_in = modified ? conf.missing_index_retry_time_on_diff : conf.missing_index_retry_time_on_unchanged
                 n_consul_index = consul_index
@@ -242,7 +247,7 @@ module Consul
                   queue.push(n_consul_index)
                 end
               end
-              result = ConsulResult.new(new_content, modified, http_result, n_consul_index, stats, retry_in)
+              result = ConsulResult.new(new_content, modified, http_result, n_consul_index, stats, retry_in, fake: false)
               @last_result = result
               @ready = true
               @s_callbacks.each { |c| c.call(result) }

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.9.7'.freeze
+    VERSION = '1.9.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.8
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request