consul-templaterb 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b4a47eabba659837253d921211008b5e44d625f6b0229d38da9dfbdfe2570b4
-  data.tar.gz: 5bfae8c915b2a263f6f5e3d9867f48e1b43abb6a7bcba5e31754efdb5a6c905b
+  metadata.gz: 108f2c7ab2a9ad7a5153a9bb0589a5964da4cc6c87354fd8b09504bfde519431
+  data.tar.gz: 7307427ef26bc8e0fec2d38ea64568d327d5df18a530b092d97e71ce14d736cd
 SHA512:
-  metadata.gz: e6f34ac0190a98f5a27e1250a2c8c4aa7c49687857337e83ac7cd02bd4c3659e367e821805cec08625ad42a797419018d707fdccdede1a15bf879a259d346e86
-  data.tar.gz: aef9aaa4acab258920984b042333e1190a49f50d0ec67f0e4c86613e1adcc908c7899dce9922da2395e3efb07404e5be32e887d66ee3d89790d861298fc64db0
+  metadata.gz: 0791904a177e227316c3c4e062ec1291620dd1e067ac5a3a80f172df501dbd2f902ba747841d2b94b53903bd5ee3ddaa6a33cdbf553f2d730b71af696ff98fb6
+  data.tar.gz: 8c305969be4be2eef1b726ef7ea04dd0d28a0a3861aa05dd08e54911207461e3c696949b029ea4a46d4a603772946d93b115aa4b8f33f3f75e92338e6a9058b8

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## (UNRELEASED)
 
+## 1.5.2 (September 24, 2018)
+
+ * added to_a method to Arrays
+ * Improved Consul-UI templates to have proper list of DCs
+
 ## 1.5.2 (September 12, 2018)
 
 IMPROVEMENTS:

data/lib/consul/async/consul_template.rb

@@ -285,13 +285,14 @@ module Consul
     end
 
     class ConsulTemplateAbstractMap < ConsulTemplateAbstract
-      def_delegators :result_delegate, :each, :[], :keys, :sort, :values, :each_pair, :each_value
+      def_delegators :result_delegate, :each, :[], :keys, :sort, :select, :values, :each_pair, :each_value, :count, :empty?, :map
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end
     end
 
     class ConsulTemplateAbstractArray < ConsulTemplateAbstract
+      def_delegators :result_delegate, :each, :[], :sort, :select, :each_value, :count, :empty?, :map, :to_a
       def initialize(consul_endpoint)
         super(consul_endpoint)
       end

data/lib/consul/async/endpoint.rb

@@ -67,10 +67,6 @@ class Endpoint
     req
   end
 
-  def log(level, message)
-
-  end
-
   def _handle_error(http, consul_index)
     retry_in = [600, conf.retry_duration + 2**@consecutive_errors].min
     STDERR.puts "[ERROR][#{path}] X-Consul-Index:#{consul_index} - #{http.error} - Retry in #{retry_in}s #{stats.body_bytes_human}"
@@ -85,8 +81,8 @@ class Endpoint
 
   def fetch
     options = {
-        connect_timeout: 5, # default connection setup timeout
-        inactivity_timeout: conf.wait_duration + 1, # default connection inactivity (post-setup) timeout
+      connect_timeout: 5, # default connection setup timeout
+      inactivity_timeout: conf.wait_duration + 1, # default connection inactivity (post-setup) timeout
     }
     connection = EventMachine::HttpRequest.new(conf.base_url, options)
     cb = proc do |consul_index|

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.5.2'.freeze
+    VERSION = '1.5.3'.freeze
   end
 end

data/samples/consul-ui/consul_nodes.json.erb

@@ -59,6 +59,6 @@
     end
   end
 %><%
-  json_datacenters = datacenters
+  json_datacenters = datacenters.to_a
   json = { nodes: service_per_node, datacenters: json_datacenters, generated_at: Time.now}
 %><%= JSON.pretty_generate(json) %>

data/samples/consul-ui/consul_services.json.erb

@@ -94,6 +94,6 @@
       service[:instances] << server
     end
   end
-  json_datacenters = datacenters
+  json_datacenters = datacenters.to_a
   json = { services: json_backends, datacenters: json_datacenters, generated_at: Time.now}
 %><%= JSON.pretty_generate(json) %>

data/samples/criteo_choregraphies.html.erb

@@ -42,7 +42,14 @@
   <%
     else
       json = JSON.parse(Base64.decode64(tuple['Value']))
-      holders = json['holders']
+      begin
+        holders = json['holders']
+      rescue StandardError => e
+%>
+        <h1>Failed to parse holders <%= e %> in <%= json %></h1>
+<%
+        holders = []
+      end
     end
   %>
   <% if holders.count > 0 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request