consul-templaterb 1.21.1 → 1.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51eefaac5babe64816e5ddc8e724581e0b818d9b8e782ffd2dd8a982876a7e7a
-  data.tar.gz: 4cc8b83bca20855ed5a3b1aa95822dfebaf43a9940163be4f336fafd2e323f66
+  metadata.gz: 2a13955774e22748154d767161d2b240fbc7f47fcfa920f74e214d9e41ca2b52
+  data.tar.gz: 00ff006308911a8aadba9367f85cc7ce7009681471a6c99e7fe4c088ae0478c9
 SHA512:
-  metadata.gz: 96877dda2a74c4d7a7647d3b5853914fa67bacb5a4875b23d31027a28d43464e2c1709d0129f78a56f0fa8be0bfba9beb82cd09e727d68587ce0cae7b82a4242
-  data.tar.gz: b0170687c2d25d47cb1c2f0d66f1cfce1eaad5772d171dd30f5d118d66cf0154bb91072cca288aa88f0b4e2275883de1152c90501dde60cc21e03d252734b45e
+  metadata.gz: 377bc047876586bd0ddadb8339b29ed6256398d5ffbd4d93503d6d712d0e197848066409769f5f4ce2ea02aade3cc3ad0e19e4662d81ac9cff8f688ec69f9455
+  data.tar.gz: b745bd8859ed065da5bc16f19a7d501b878859af4bdced48564771c922e816ff6ba21bdd993042f940320364d1b16ba9f9eb790d6032ca4057eb1b0252ff13b9

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## (UNRELEASED)
 
+## 1.21.2 (November 22, 2019)
+
+* Added instance information into serviceMetaDecorator() calls to
+  allow more sophisticated decorators.
+
 ## 1.21.1 (November 22, 2019)
 
 * Default service meta decorator now decorates http/https links in

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.21.1'.freeze
+    VERSION = '1.21.2'.freeze
   end
 end

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

@@ -22,7 +22,7 @@ function serviceInstanceDecorator(instance, element) {
  * serviceMetaDecorator must return a HTML node to decorate a service instance meta.
  * It should return the decorated element.
  */
-function serviceMetaDecorator(key, value) {
+function serviceMetaDecorator(instance, key, value) {
     if (httpRegexp.test(value)) {
       return url_decorator(key, value);
     } else {

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

@@ -308,7 +308,7 @@ class ServiceMainSelector extends MainSelector {
             element.appendChild(tagsGenerator(instance.tags));
             element.appendChild(document.createElement("hr"));
         }
-        element.appendChild(serviceMetaGenerator(instance.sMeta));
+        element.appendChild(serviceMetaGenerator(instance));
         element.appendChild(connectGenerator(instance));
         element.appendChild(checksStatusGenerator(instance, instance.name));
         element.setAttribute("status", state);

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

@@ -175,7 +175,8 @@ function connectGenerator(instance) {
     return connectItem
 }
 
-function serviceMetaGenerator(instanceMeta) {
+function serviceMetaGenerator(instance) {
+    var instanceMeta = instance.sMeta;
     var top = document.createElement('div');
     top.className = 'instance-meta';
     if (instanceMeta) {
@@ -189,7 +190,7 @@ function serviceMetaGenerator(instanceMeta) {
             container.appendChild(metaH);
             var metaVH = document.createElement('dd');
             metaVH.className = 'col-sm-8 lookup';
-            metaVH.appendChild(serviceMetaDecorator(meta, instanceMeta[meta]));
+            metaVH.appendChild(serviceMetaDecorator(instance, meta, instanceMeta[meta]));
             container.appendChild(metaVH);
         }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.21.1
+  version: 1.21.2
 platform: ruby
 authors:
 - SRE Core Services