consul-templaterb 1.21.2 → 1.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a13955774e22748154d767161d2b240fbc7f47fcfa920f74e214d9e41ca2b52
-  data.tar.gz: 00ff006308911a8aadba9367f85cc7ce7009681471a6c99e7fe4c088ae0478c9
+  metadata.gz: fbae8bd11b6dc743e577da583a6f47679c83fe9c1e5043ade563f90b044d5031
+  data.tar.gz: d112258989cf088ed7fe488119e088d51e9bf6be91952835f2a3af274dadb1e4
 SHA512:
-  metadata.gz: 377bc047876586bd0ddadb8339b29ed6256398d5ffbd4d93503d6d712d0e197848066409769f5f4ce2ea02aade3cc3ad0e19e4662d81ac9cff8f688ec69f9455
-  data.tar.gz: b745bd8859ed065da5bc16f19a7d501b878859af4bdced48564771c922e816ff6ba21bdd993042f940320364d1b16ba9f9eb790d6032ca4057eb1b0252ff13b9
+  metadata.gz: 1bc2a16ac0b6b933198db9bae94a3fd9e26b8045554b5de6c7dd06beb948f2036d1a069a3b12c61834e847dd48cb17d0698bb600b45cead5a6f7507c12e463e9
+  data.tar.gz: 59858e0a22f2a93cb866cdc0ea90289ed2dc2d8345dc22b97898815f025497843637f3c650025227b08211244770c241c501fb5409b904bec4b37d12cd377f6d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## (UNRELEASED)
 
+## 1.21.3 (November 23, 2019)
+
+* added serviceName information for all decorators of services
+
 ## 1.21.2 (November 22, 2019)
 
 * Added instance information into serviceMetaDecorator() calls to

data/lib/consul/async/version.rb

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

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

@@ -14,7 +14,7 @@ function url_decorator(key, value) {
 /**
  * serviceInstanceDecorator is called to decorate an instance.
  */
-function serviceInstanceDecorator(instance, element) {
+function serviceInstanceDecorator(instance, element, serviceName) {
     return element;
 }
 
@@ -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(instance, key, value) {
+function serviceMetaDecorator(instance, key, value, serviceName) {
     if (httpRegexp.test(value)) {
       return url_decorator(key, value);
     } else {

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

@@ -182,7 +182,7 @@ class ServiceSideSelector extends SideSelector {
 
     selectItem(element, service) {
         super.selectItem(element, service);
-        this.mainSelector.initSelector(this.data[service]);
+        this.mainSelector.initSelector(this.data[service], service);
     }
 }
 
@@ -246,7 +246,7 @@ class ServiceMainSelector extends MainSelector {
 
     initSelector(service) {
         if (service) {
-          super.initSelector(service.instances);
+          super.initSelector(service.instances, service.name);
           this.generateTitle(service.name);
         }
     }
@@ -292,7 +292,7 @@ class ServiceMainSelector extends MainSelector {
         resizeAll();
     }
 
-    elementGenerator(instance) {
+    elementGenerator(instance, serviceName) {
         var element = document.createElement("div");
         element.setAttribute("class", "list-group-item service-instance");
         var state = nodeState(instance.checks);
@@ -308,12 +308,12 @@ class ServiceMainSelector extends MainSelector {
             element.appendChild(tagsGenerator(instance.tags));
             element.appendChild(document.createElement("hr"));
         }
-        element.appendChild(serviceMetaGenerator(instance));
+        element.appendChild(serviceMetaGenerator(instance, serviceName));
         element.appendChild(connectGenerator(instance));
         element.appendChild(checksStatusGenerator(instance, instance.name));
         element.setAttribute("status", state);
 
-        return serviceInstanceDecorator(instance, element);
+        return serviceInstanceDecorator(instance, element, serviceName);
     }
 
     getStatus(instance) {

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

@@ -158,10 +158,10 @@ class MainSelector {
         this.maxDisplayed = this.maxDisplayElement.val();
     }
 
-    initSelector(data) {
+    initSelector(data, additionalInfo) {
         this.data = data;
         for (var key in this.data) {
-            this.data[key]["element"] = this.elementGenerator(this.data[key]);
+            this.data[key]["element"] = this.elementGenerator(this.data[key], additionalInfo);
         }
         this.refreshList();
     }

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.21.2
+  version: 1.21.3
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request