consul-templaterb 1.21.8 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f293ea13d55d0199e95f0aecb01d30293b52f411e7261328c0a90adbfbd053
-  data.tar.gz: 310fc6106203eb69db6cc2128e9abdac3c50db3449d952ad0dadba7e3d5501ff
+  metadata.gz: 5a383446773f29932a2919164fa521013123aa859be0e6f93141672083261257
+  data.tar.gz: 4d8d2916f5d25eba9d9782b5a21b762091df24e1cd7950d250418b12a1da0a46
 SHA512:
-  metadata.gz: 5c38462f4d2bff46c5d745ebaf893bf8cae04906c5b416ba6a9574cf570b31fdb5afe612a2991c966eef921ba147c1fee46fba7bbec3cde40bcffb49b39dde47
-  data.tar.gz: e263ee86afacbf6b2b32b02d7b89dbf8d05d019b24267c52b446719f9eb301cf9ae53d9d017a879f39ef1a5c074e6313062e16c4adb25f53e7f3c49c1260f575
+  metadata.gz: e170417393ad454623c8a2d6e67e2d71ee6642f5ab61ca300836406c8892dd0c8852c610d4671f75c887c547134f8ddd046d20952a75149d8ad8e88c5e6f6230
+  data.tar.gz: 4ac536f6a1f67f3d43d59829cf0427ecc92176e6adba35956ece9f392c8dcc87a9c68824eb9f1b84e3ed86e043996802aeecd8010ccc0f7cbfbb64a97fbae1f8

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 rvm:
-- 2.4.7
-- 2.5.6
-- 2.6.4
+- 2.4.8
+- 2.5.7
+- 2.6.5
+- 2.7.0
 jobs:
   include:
     - stage: Gem release
-      rvm: 2.5.6
+      rvm: 2.5.7
       script: echo "Publishing consul-templaterb on rubygems.org ..."
       deploy:
         provider: rubygems

data/CHANGELOG.md

@@ -2,42 +2,62 @@
 
 ## (UNRELEASED)
 
+## 1.22.0 (January 17, 2020)
+
+NEW FEATURES:
+
+ * Fixed compatibility with Ruby 2.7+ (fixes #57)
+
 ## 1.21.8 (January 2, 2020)
 
-* Escape properly metadata containing double quotes in prometheus exporter
+BUGFIX:
+
+ * Escape properly metadata containing double quotes in prometheus exporter
 
 ## 1.21.7 (December 16, 2019)
 
-* Fixed warning color from critical to warning on consul-ui timeline
+IMPROVEMENTS:
+
+ * Fixed warning color from critical to warning on consul-ui timeline
 
 ## 1.21.6 (December 16, 2019)
 
-* Added node_meta_info for serviceInstanceDecorator and serviceMetaDecorator
+IMPROVEMENTS:
+
+ * Added node_meta_info for serviceInstanceDecorator and serviceMetaDecorator
 
 ## 1.21.5 (December 6, 2019)
 
-* Added clean() method in nodes.js to allow nexw behaviors
+NEW FEATURES:
+
+ * Added clean() method in nodes.js to allow nexw behaviors
 
 ## 1.21.4 (November 28, 2019)
 
-* added 2 decorators `navBarDecorator` and `fetchedResponseDecorator`
+NEW FEATURES:
+
+ * added 2 decorators `navBarDecorator` and `fetchedResponseDecorator`
 
 ## 1.21.3 (November 23, 2019)
 
-* added serviceName information for all decorators of services
+IMPROVEMENTS:
+
+ * added serviceName information for all decorators of services
 
 ## 1.21.2 (November 22, 2019)
 
+IMPROVEMENTS:
+
 * Added instance information into serviceMetaDecorator() calls to
   allow more sophisticated decorators.
 
 ## 1.21.1 (November 22, 2019)
 
+IMPROVEMENTS:
+
 * Default service meta decorator now decorates http/https links in
   service meta
 
-NEW FEATURES:
-
 ## 1.21.0 (November 21, 2019)
 
 * added function `templates` to list all templates being rendered
@@ -194,26 +214,26 @@ It avoid templates never rendering fully when keys appear/disappear.
 
 NEW FEATURES
 
-consul-templaterb now returns an error code whether template is malformed.
-This allows to use return code to validate templates when called with `--once`.
+ * consul-templaterb now returns an error code whether template is malformed.
+   This allows to use return code to validate templates when called with `--once`.
 
 IMPROVEMENTS
 
-Do not display ugly stack trace when interrupting program with CRTL-C.
+ * Do not display ugly stack trace when interrupting program with CRTL-C.
 
 ## 1.14.1 (May 13, 2019)
 
 NEW FEATURES
 
-`endpoint.stats.last_modified` allow to display the date at which the data was last modified.
+ * `endpoint.stats.last_modified` allow to display the date at which the data was last modified.
 
 ## 1.14.0 (May 6, 2019)
 
 NEW FEATURES:
 
-When `return nil` is performed in a template, consul-templaterb now considers the template is
-not ready and thus do not start any process. It is useful if you want to start a process ONLY
-when some conditions are met.
+ * When `return nil` is performed in a template, consul-templaterb now considers the template is
+   not ready and thus do not start any process. It is useful if you want to start a process ONLY
+   when some conditions are met.
 
 ## 1.13.1 (April 12, 2019)
 
@@ -232,7 +252,7 @@ IMPROVEMENTS:
 
 NEW FEATURES:
 
-* Windows compatible
+ * Windows compatible
 
 consul-templaterb now works on Windows.
 
@@ -240,7 +260,7 @@ consul-templaterb now works on Windows.
 
 NEW FEATURES:
 
-* Added new function render_from_string() to render a template from a string (useful with KV)
+ * Added new function render_from_string() to render a template from a string (useful with KV)
 
 ## 1.10.1 (February 28, 2019)
 

data/bin/consul-templaterb

@@ -288,8 +288,11 @@ STDERR.puts "Max number of descriptors set to #{new_size}" if options[:consul][:
 # See https://github.com/eventmachine/eventmachine/issues/636#issuecomment-143313282
 EM.epoll
 
-consul_conf = Consul::Async::ConsulConfiguration.new(options[:consul])
-vault_conf = Consul::Async::VaultConfiguration.new(options[:vault])
+# https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+def ruby2_keywords(*); end if RUBY_VERSION < '2.7'
+
+consul_conf = Consul::Async::ConsulConfiguration.new(**options[:consul])
+vault_conf = Consul::Async::VaultConfiguration.new(**options[:vault])
 
 ARGV.each do |tpl|
   dest = compute_default_output(tpl)

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.21.8'.freeze
+    VERSION = '1.22.0'.freeze
   end
 end

data/samples/demos/compute_pricing.txt.erb

@@ -0,0 +1,59 @@
+<%
+# This template compute price of infrastructure
+# based on the kind of machine the software is running on
+# Demo performed during HashiConf 2019
+# https://hashiconf.com/us/schedule/inversion-of-control-with-consul
+
+regexp = 'web-.*'
+srv_selector = Regexp.new(regexp)
+
+costs = {
+    'unknown'                 => 8,
+    'base-10g-2018-q-1'       => 10,
+    'base-10g-2015'           => 9,
+    'base-1g-2013-1'          => 5,
+    'base-1g-2015'            => 7,
+    'base-1g-2013'            => 6,
+    'cpustorage-10g-2018-h-1' => 15,
+    'io-10g-2018-h-1'         => 12,
+    'ram-1g-2015'             => 8,
+    'ram-10g-2018-q-1'        => 9,
+    'storage-10g-2015-1'      => 11,
+    'storage-1g-2015-1'       => 10,
+    'ssd-10g-2015'            => 12,
+    'ram-10g-2015' => 42,
+}
+
+
+instances = {}
+datacenters.each do |dc|
+    services(dc:dc).each do |srv_name, tags|
+        if srv_selector.match(srv_name)
+            service(srv_name, dc:dc).each do |snode|
+                instances[snode['Node']['Node']] = snode
+            end
+        end
+    end
+end
+
+
+
+result = {
+    'summary' => "Price for #{regexp}",
+    'machines'=> instances.count,
+    'price'   => 0,
+    'flavors' => {},
+}
+
+instances.each do |name, snode|
+  type = snode.service_or_node_meta_value('criteo_flavor')
+  flavor_count = result['flavors'][type] || 0
+  result['flavors'][type] = flavor_count + 1
+  cost = costs[type] || costs['unknown']
+  cost += 3 if snode.service_or_node_meta_value('os') == 'windows'
+  result['price'] += cost
+end
+
+result['unkown_prices_for'] = result['flavors'].select{ |k| costs[k].nil? }
+
+%><%= YAML.dump(result) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.21.8
+  version: 1.22.0
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -224,6 +224,7 @@ files:
 - samples/consul_template_broken.txt.erb
 - samples/criteo/haproxy.cfg.erb
 - samples/debug/compare_connect_services.txt.erb
+- samples/demos/compute_pricing.txt.erb
 - samples/ha_proxy.cfg.erb
 - samples/haproxy_dns.cfg.erb
 - samples/hosts.erb