consul-templaterb 1.26.0 → 1.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f77f92ae3811c48a823724fb4fb242b78fb78713de126cc035de4089a5e607
-  data.tar.gz: 3aa6c6f9c1aca03006963dd03ab30c3ba9ceabc4ff88c3a0d7fa8470a024b2d2
+  metadata.gz: 91552da1b0e2061c69095c958665896efc6de84ae6c5374a1b66d1c9550a3297
+  data.tar.gz: 8bdf67de550a4e2cb7d621ccad117e1e0841b3a0a49bcefb5c914e63daeddb41
 SHA512:
-  metadata.gz: ed5763f1c109d678a867dddbe77a2b4e8d0b9adde1663f80e9bb6db2812c104f84edcd9f5c929d8e1f4763e9b4fa3af138da87c58af1285d6f1b0c6f5924760d
-  data.tar.gz: af7a53d991a486b4050632576b36c2cb1fe5e899bee75ec73a2e6bd76bb18e350913e5703b69ee8a05aa51b2d64a64a60b8c17dcc1e071b8cac3544331de0600
+  metadata.gz: 24a9e291106b8e32ddef2bdc3d5e87ded36122c84dd1f0547fb034410d606609dd0041d011cd4eeb58da7b38a579888fb5901e877814d49926ef7a0722020d15
+  data.tar.gz: d3b1b5578cfdc3ee7c594916fc53e22692506d1bc0faaafd91ca21891665732528e95a384766548c90c75bcec0b515f856d1236ffbd18572911363d6ab8f836b

data/CHANGELOG.md

@@ -2,16 +2,23 @@
 
 ## (UNRELEASED)
 
-NEW FEATURES:
+## 1.26.1 (March 27, 2020)
+
+BUGFIX:
+
+ * Using `agent: http://vault_or_consul_agent:port>` was not properly taken into account in some endpoints
 
 ## 1.26.0 (March 5, 2020)
 
+NEW FEATURES:
+
  * Using `agent: http://vault_or_consul_agent:port>` on most methods will now override the agent
    used to perform Consul queries. It might be useful for very large clusters or large WAN federations,
    because you can perform some requests on some agents, and some others on other agenrs. Might
    also be useful to federate data from preprod/prod for instance.
-   See [samples/all_services_multi_agents.txt.erb](samples/all_services_multi_agents.txt.erb) for an
-   example.
+ * Added agent attribute for all methods in documentation
+ * Added [samples/all_services_multi_agents.txt.erb](samples/all_services_multi_agents.txt.erb) as an
+   example of new feature.
 
 ## 1.25.2 (February 29, 2020)
 

data/docs/article-06_Template-based_discovery_with_consul-templaterb.md

@@ -120,4 +120,5 @@ If you don’t want to bother configuring and tuning it, you can try it very qui
 * [Mixing Observability with Service Discovery](https://medium.com/criteo-labs/mixing-observability-with-service-discovery-2bb8909e8530)
 
 Pierre Souchay, 2020-03-03
-Also published on https://medium.com/criteo-labs/template-based-discovery-with-consul-templaterb-8ff88434c457
+
+Also published on https://medium.com/criteo-labs/template-based-discovery-with-consul-templaterb-8ff88434c457

data/lib/consul/async/consul_template.rb

@@ -53,7 +53,7 @@ module Consul
         query_params = {}
         query_params[:dc] = dc if dc
         @endp_manager.create_if_missing(path, query_params, agent: agent) do
-          ConsulTemplateNodes.new(ConsulEndpoint.new(@endp_manager.consul_conf, path, true, query_params, '[]', agent: agent))
+          ConsulTemplateNodes.new(ConsulEndpoint.new(@endp_manager.consul_conf, path, true, query_params, '[]', agent))
         end
       end
 
@@ -63,7 +63,7 @@ module Consul
         query_params = {}
         query_params[:dc] = dc if dc
         @endp_manager.create_if_missing(path, query_params, agent: agent) do
-          ConsulTemplateNodes.new(ConsulEndpoint.new(@endp_manager.consul_conf, path, true, query_params, '[]', agent: agent))
+          ConsulTemplateNodes.new(ConsulEndpoint.new(@endp_manager.consul_conf, path, true, query_params, '[]', agent))
         end
       end
 
@@ -136,7 +136,7 @@ module Consul
         query_params[:dc] = dc if dc
         query_params[:passing] = passing if passing
         query_params[:tag] = tag if tag
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateService.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]')) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateService.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]', agent)) }
       end
 
       # https://www.consul.io/api/health.html#list-checks-for-service
@@ -147,7 +147,7 @@ module Consul
         query_params = {}
         query_params[:dc] = dc if dc
         query_params[:passing] = passing if passing
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateChecks.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]')) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateChecks.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]', agent)) }
       end
 
       # https://www.consul.io/api/health.html#list-checks-for-node
@@ -158,7 +158,7 @@ module Consul
         query_params = {}
         query_params[:dc] = dc if dc
         query_params[:passing] = passing if passing
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateChecks.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]')) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateChecks.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]', agent)) }
       end
 
       # https://www.consul.io/api/catalog.html#list-nodes
@@ -166,7 +166,7 @@ module Consul
         path = '/v1/catalog/nodes'
         query_params = {}
         query_params[:dc] = dc if dc
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateNodes.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]')) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateNodes.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]', agent)) }
       end
 
       # https://www.consul.io/api/catalog.html#list-services-for-node
@@ -174,7 +174,7 @@ module Consul
         path = "/v1/catalog/node/#{name_or_id}"
         query_params = {}
         query_params[:dc] = dc if dc
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateNodes.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '{}')) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateNodes.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '{}', agent)) }
       end
 
       # https://www.consul.io/api/agent.html#read-configuration
@@ -182,7 +182,7 @@ module Consul
         path = '/v1/agent/self'
         query_params = {}
         default_value = '{"Config":{}, "Coord":{}, "Member":{}, "Meta":{}, "Stats":{}}'
-        create_if_missing(path, query_params, agent: agent) { ConsulAgentSelf.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value)) }
+        create_if_missing(path, query_params, agent: agent) { ConsulAgentSelf.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value, agent)) }
       end
 
       # https://www.consul.io/api/agent.html#view-metrics
@@ -190,7 +190,7 @@ module Consul
         path = '/v1/agent/metrics'
         query_params = {}
         default_value = '{"Gauges":[], "Points":[], "Member":{}, "Counters":[], "Samples":{}}'
-        create_if_missing(path, query_params, agent: agent) { ConsulAgentMetrics.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value)) }
+        create_if_missing(path, query_params, agent: agent) { ConsulAgentMetrics.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value, agent)) }
       end
 
       # https://www.consul.io/api/agent.html#list-members
@@ -199,7 +199,7 @@ module Consul
         query_params = {}
         query_params['wan'] = true if wan
         default_value = '[]'
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateMembers.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value)) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateMembers.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value, agent)) }
       end
 
       # Return a param of template
@@ -222,14 +222,14 @@ module Consul
         query_params[:dc] = dc if dc
         # Tag filtering is performed on client side
         query_params[:tag] = tag if tag
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateServices.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '{}')) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateServices.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '{}', agent)) }
       end
 
       # https://www.consul.io/api/catalog.html#list-datacenters
       def datacenters(agent: nil)
         path = '/v1/catalog/datacenters'
         query_params = {}
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateDatacenters.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]')) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateDatacenters.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '[]', agent)) }
       end
 
       # https://www.consul.io/api/kv.html#read-key
@@ -240,7 +240,7 @@ module Consul
         query_params[:recurse] = recurse if recurse
         query_params[:keys] = keys if keys
         default_value = '[]'
-        create_if_missing(path, query_params, agent: agent) { ConsulTemplateKV.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value), name) }
+        create_if_missing(path, query_params, agent: agent) { ConsulTemplateKV.new(ConsulEndpoint.new(consul_conf, path, true, query_params, default_value, agent), name) }
       end
 
       def secrets(path = '', agent: nil)

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.26.0'.freeze
+    VERSION = '1.26.1'.freeze
   end
 end

data/samples/find_all_invalid_dns_labels.json.erb

@@ -0,0 +1,12 @@
+<%
+  r = /^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,62}[a-zA-Z0-9])?$/
+  invalid_services = {}
+  services.each do |servive_name, tags|
+    errors = []
+    errors << "Invalid service name #{servive_name}" unless r.match(servive_name)
+    tags.each do |tag|
+      errors << "Invalid tag #{tag}" unless r.match(tag)
+    end
+    invalid_services[servive_name] = errors unless errors.empty?
+  end
+%><%= JSON.pretty_generate({"errors": invalid_services.size, "details": invalid_services}) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.26.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -229,6 +229,7 @@ files:
 - samples/criteo/haproxy.cfg.erb
 - samples/debug/compare_connect_services.txt.erb
 - samples/demos/compute_pricing.txt.erb
+- samples/find_all_invalid_dns_labels.json.erb
 - samples/ha_proxy.cfg.erb
 - samples/haproxy_dns.cfg.erb
 - samples/hosts.erb