consul-templaterb 1.33.1 → 1.33.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c7c1fcf9c8e0685664f79da1b48f7e15dabdaa959ad12172f64313877f9551
-  data.tar.gz: d54d351404c5f76d7e08b502b1f905b9709a2666a6641ad7c24aa7d9b122e6a7
+  metadata.gz: 47eaa92845652a63849a621657d850033637d379ca3c052b4829ef395ca00c8a
+  data.tar.gz: 93b6efa0a2644b0595f428b30c54e078ae6e8675f8e3333789a78270f895e878
 SHA512:
-  metadata.gz: 29b61accf646ff4fe11946f2bafc37bd6dea31e50b9d6c01a0ded3c3c1992ae394060f1e0711136492170810c6fe5f7a25e1b06a3930d6218986f0acfee5ca34
-  data.tar.gz: 50ab860a1eb59c0c7b99e97eb3ed95edfcfd94452917c69a462145d5d9700c16790631010c8aa7950b17d601b095bb3b799b11d852d84c3b23a1f0150ee230b7
+  metadata.gz: 55648527a4f03b75ee82dc8d6a59fcc1269c67e567950772651c69e53d976e2158d885ba128b5ff6a119a1932002430c2020c2ed6ec27b4aa5bcd59785e73c49
+  data.tar.gz: b087e056e7c511c174c0be95b18a38cfdfaa26f74f530c7eaab88b45c8f5c487b475a9743c79aa02b51dd1948db6c47652021271c74c8058060e547d60a64f03

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.31.2 (Aug 04 2022)
+
+BUG FIX:
+
+* URL encode service and KV names when calling the http API
+
 ## 1.31.1 (Feb 281 2022)
 
 BUG FIX:

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/criteo/consul-templaterb/workflows/Ruby/badge.svg?branch=master)](https://github.com/criteo/consul-templaterb/actions?query=branch%3Amaster)
 [![Gem Version](https://badge.fury.io/rb/consul-templaterb.svg)](http://github.com/criteo/consul-templaterb/releases)
-[![GEM Downloads](https://ruby-gem-downloads-badge.herokuapp.com/consul-templaterb?type=total&metric=true)](https://rubygems.org/gems/consul-templaterb)
+[![GEM Downloads](https://img.shields.io/gem/dt/consul-templaterb.svg)](https://rubygems.org/gems/consul-templaterb)
 [![License](https://img.shields.io/badge/license-ApacheV2-yellowgreen.svg)](#license)
 
 The ruby GEM [consul-templaterb](https://rubygems.org/gems/consul-templaterb)

data/lib/consul/async/consul_template.rb

@@ -132,7 +132,7 @@ module Consul
       def service(name, dc: nil, passing: false, tag: nil, agent: nil)
         raise 'You must specify a name for a service' if name.nil?
 
-        path = "/v1/health/service/#{name}"
+        path = '/v1/health/service/' + ERB::Util.url_encode(name.to_s)
         query_params = {}
         query_params[:dc] = dc if dc
         query_params[:passing] = passing if passing
@@ -144,7 +144,7 @@ module Consul
       def checks_for_service(name, dc: nil, passing: false, agent: nil)
         raise 'You must specify a name for a service' if name.nil?
 
-        path = "/v1/health/checks/#{name}"
+        path = '/v1/health/checks/' + ERB::Util.url_encode(name.to_s)
         query_params = {}
         query_params[:dc] = dc if dc
         query_params[:passing] = passing if passing
@@ -155,7 +155,7 @@ module Consul
       def checks_for_node(name, dc: nil, passing: false, agent: nil)
         raise 'You must specify a name for a service' if name.nil?
 
-        path = "/v1/health/node/#{name}"
+        path = '/v1/health/node/' + ERB::Util.url_encode(name.to_s)
         query_params = {}
         query_params[:dc] = dc if dc
         query_params[:passing] = passing if passing
@@ -184,7 +184,7 @@ module Consul
 
       # https://www.consul.io/api/catalog.html#list-services-for-node
       def node(name_or_id, dc: nil, agent: nil)
-        path = "/v1/catalog/node/#{name_or_id}"
+        path = '/v1/catalog/node/' + ERB::Util.url_encode(name_or_id.to_s)
         query_params = {}
         query_params[:dc] = dc if dc
         create_if_missing(path, query_params, agent: agent) { ConsulTemplateNode.new(ConsulEndpoint.new(consul_conf, path, true, query_params, '{}', agent)) }
@@ -247,7 +247,7 @@ module Consul
 
       # https://www.consul.io/api/kv.html#read-key
       def kv(name = nil, dc: nil, keys: nil, recurse: false, agent: nil)
-        path = "/v1/kv/#{name}"
+        path = '/v1/kv/' + ERB::Util.url_encode(name.to_s)
         query_params = {}
         query_params[:dc] = dc if dc
         query_params[:recurse] = recurse if recurse

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.33.1'.freeze
+    VERSION = '1.33.3'.freeze
   end
 end

data/samples/consul-ui/decorators.js.erb

@@ -39,7 +39,7 @@ function usefullLinksGenerator(instance, serviceName, node_meta_info) {
 /**
  * createNodeDisplayElement resolves and displays the node name.
  */
-function createNodeDisplayElement(nodeName, nodemeta) {
+function createNodeDisplayElement(nodeName, _nodemeta, _instanceFqdn) {
   return document.createTextNode(nodeName);
 }
 

data/samples/consul-ui/js/utils.js

@@ -87,7 +87,7 @@ function serviceTitleGenerator(instance, serviceName, node_info) {
     }
 
     var nodemeta = (node_info != null) ? node_info.meta : null; 
-    instanceLink.appendChild(createNodeDisplayElement(instance.name, nodemeta));
+    instanceLink.appendChild(createNodeDisplayElement(instance.name, nodemeta, instance?.sMeta?.fqdn));
     instanceLink.appendChild(document.createTextNode(appendPort));
 
     const nodeInfo = document.createElement('a');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.33.1
+  version: 1.33.3
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request