consul-templaterb 1.28.1 → 1.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca62994383929bd3874db5527f85efeaaf184fdb83b8f3b17e05fbadbfbbc90a
-  data.tar.gz: e878ff880557ffdfd8db6e5cb900a19e8191d4db11ba28fa0b4e7bbe9b1b9240
+  metadata.gz: 5b99b274e76706dd09a6da62555cc79c462d5072237825fb10fea80ef3d3e558
+  data.tar.gz: 68e4a32addfb0decb19e8dbda17dfc99665c6e19da03d789cddf61196c051c7a
 SHA512:
-  metadata.gz: 62afc852ef61329a30bba3a67f43ed372130d9a87cd1afce559b5f88f9aa0a6db336c84c63b173eaa96896e8c9088686cfa37f10d540cd91c80ca2fb976b00b3
-  data.tar.gz: 4a02aa15f2d4f95e5d144e916bf6a51190a90756e134456aece5b4afbf7ba106e150faeb8cf7b0e09ff27f1f61b237c47dd11f236299d922a519e91b019e3705
+  metadata.gz: c1385863a2b51bb12c4b900c869a82048acecec0abe9e6875e151cf39151e5f0ff983b130549191d236315c22ff45e61810c515397d75fe2847dc28e70044499
+  data.tar.gz: 9a6acde596746461c64b99145f13952e4e4cfc4ea009b9e31f65afab96f5e7ecf93f5764ad7d0e5fd98e5b37419bc5b60c169abf6aefdc5bb2cbbd55f1495c30

data/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 ## (UNRELEASED)
 
-## 1.28.1 (Sept 30,, 2020)
+## 1.28.2 (Oct 5, 2020)
+
+NEW FEATURES:
+
+ * Added new decorator to compute node names in consul-ui ([#70](https://github.com/criteo/consul-templaterb/pull/70))
+
+## 1.28.1 (Sept 30, 2020)
 
 IMPROVEMENTS:
 

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.28.1'.freeze
+    VERSION = '1.28.2'.freeze
   end
 end

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

@@ -36,6 +36,13 @@ function usefullLinksGenerator(instance, serviceName, node_meta_info) {
     return top;
 }
 
+/**
+ * createNodeDisplayElement resolves and displays the node name.
+ */
+function createNodeDisplayElement(nodeName, nodemeta) {
+  return document.createTextNode(nodeName);
+}
+
 /**
  * serviceInstanceDecorator is called to decorate an instance.
  */

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

@@ -71,7 +71,7 @@ class NodeMainSelector extends MainSelector {
         content.setAttribute('class', 'instance-content');
         var contentHead = document.createElement('div');
         contentHead.setAttribute('class', 'instance-content-header');
-        contentHead.appendChild(nodeNameGenator(node['Node']['Name'], node['Node']['Address']));
+        contentHead.appendChild(nodeNameGenator(node['Node']));
         contentHead.appendChild(nodeAddressGenator(node['Node']['Address']));
         contentHead.appendChild(nodeMetaGenerator(node['Node']['Meta']));
         content.appendChild(contentHead);

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

@@ -304,8 +304,8 @@ class ServiceMainSelector extends MainSelector {
         element.setAttribute("class", "list-group-item service-instance");
         var state = nodeState(instance.checks);
         element.appendChild(weightsGenerator(instance.weights, state));
-        element.appendChild(serviceTitleGenerator(instance, serviceName));
         var node_info = this.nodes[instance.name];
+        element.appendChild(serviceTitleGenerator(instance, serviceName, node_info));
         if (node_info != null) {
             node_info = node_info.meta;
             element.appendChild(nodeMetaGenerator(node_info, instance.sMeta));

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

@@ -63,7 +63,7 @@ function nodeState(checks) {
 
 supported_protocols = ['https', 'http', 'sftp', 'ftp', 'ssh', 'telnet']
 
-function serviceTitleGenerator(instance, serviceName) {
+function serviceTitleGenerator(instance, serviceName, node_info) {
     var protocol = null;
     for (i in supported_protocols) {
         var protoc = supported_protocols[i]
@@ -86,7 +86,10 @@ function serviceTitleGenerator(instance, serviceName) {
         instanceLink.setAttribute('target', '_blank');
     }
 
-    instanceLink.appendChild(document.createTextNode(instance.name + appendPort));
+    var nodemeta = (node_info != null) ? node_info.meta : null; 
+    instanceLink.appendChild(createNodeDisplayElement(instance.name, nodemeta));
+    instanceLink.appendChild(document.createTextNode(appendPort));
+
     const nodeInfo = document.createElement('a');
     nodeInfo.appendChild(document.createTextNode('\u24D8'));
     nodeInfo.setAttribute('title', 'Click to see details of Node: ' + instance.name +
@@ -103,7 +106,7 @@ function serviceTitleGenerator(instance, serviceName) {
     return htmlTitle;
 }
 
-function nodeNameGenator(nodename, nodeaddr) {
+function nodeNameGenator(node) {
     var protocol = 'ssh://'
 
     var htmlTitle = document.createElement('h5');
@@ -111,10 +114,10 @@ function nodeNameGenator(nodename, nodeaddr) {
     var instanceLink = document.createElement('a');
     instanceLink.setAttribute('class', 'instance-name');
     if (protocol != null) {
-        instanceLink.setAttribute('href', protocol + nodeaddr);
+        instanceLink.setAttribute('href', protocol + node['Address']);
         instanceLink.setAttribute('target', '_blank');
     }
-    instanceLink.appendChild(document.createTextNode(nodename));
+    instanceLink.appendChild(createNodeDisplayElement(node['Name'], node['Meta']));
     htmlTitle.appendChild(instanceLink);
 
     return htmlTitle;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.28.1
+  version: 1.28.2
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request