bjn_inventory 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcd99bdf01564c9b9328bd816c7d682dca6ac94d
-  data.tar.gz: 003a564bc69f38caa487927671c7f98e4eaa201e
+  metadata.gz: 7c369f7e212b129cc8ac7a5250d52871f2deacc8
+  data.tar.gz: 21598b6ea85a9a682ae56f9225427d77c87b189d
 SHA512:
-  metadata.gz: 891137548bf9420e4a7bd654d23776257d9d1253d4f349439183dee2efc45cfb00717ac3ab2e9321d96b587ab902a36161d1bcc103ea09487cde7931e657147d
-  data.tar.gz: e839db1948ea6d4bc9861edf16547bd0304f05e308606918e1b2a89e38511bdf11340bd712c7debe44ebf5eb7d7c24e23a3969c7d7d92b45a2571de2be295c39
+  metadata.gz: f9a44ce178222496e27deeb2d5f4ac243d16f281380e88acfd138ece48e906f4cc62bd5ebeaffe3ca695a18144daf0f6acf365725011982ea96ca9001ccd5f30
+  data.tar.gz: 14822ee517b05531ffb82397316658d9794f13482639d3135d909dc63826058ec396393bdb225518ba23868253d135f81288283544b1b32410e4c5bd72553f8b

data/README.md

@@ -307,6 +307,12 @@ You create the following service map:
         "hosts": ["web"],
         "port": 80
       }
+      "$cluster": {
+        "qwerty": {
+          "hosts": ["qwerty"],
+          "hosts_override": "$region.$cluster.com"
+        }
+      }
     }
   },
   "monitor": {
@@ -328,11 +334,17 @@ get the following output:
   "services": {
     "us-west-2": {
       "www.hosts": "10.0.1.1",
-      "www.port": 80
+      "www.port": 80,
+      "qwerty_cluster": {
+        "qwerty.hosts": "us-west-2.qwerty_cluster.com"
+      }
     },
     "eu-west-1": {
       "www.hosts": "10.0.10.1",
-      "www.port": 80
+      "www.port": 80,
+      "qwerty_cluster": {
+        "qwerty.hosts": "eu-west-1.qwerty_cluster.com"
+      }
     }
   },
   "monitor": {

data/lib/bjn_inventory/service_map.rb

@@ -11,6 +11,7 @@ module BjnInventory
             @logger = kwargs[:logger] || BjnInventory::DefaultLogger.new
 
             @hosts_field = kwargs[:hosts]               || 'hosts'
+            @hosts_override = kwargs[:hosts_override]   || 'hosts_override'
             @endpoint_fields = kwargs[:endpoint_fields] || ['endpoint', 'ip_address']
             @join = kwargs[:join]                       || ','
             separator = kwargs[:separator]              || '__'
@@ -67,6 +68,10 @@ module BjnInventory
                             end
                             service_keylist[interpolated_path][@hosts_field] << _endpoint(self[device_name])
                         end
+                        if service[@hosts_override] && service_keylist[interpolated_path][@hosts_field]
+                            service_keylist[interpolated_path][@hosts_field] = [_interpolate_value(path, self[device_name], service[@hosts_override])]
+                            service_keylist[interpolated_path].delete(@hosts_override)
+                        end
                     end
                 end
             end
@@ -85,6 +90,23 @@ module BjnInventory
             end
         end
 
+        def _interpolate_value(path, device, value)
+            replacement_value = value
+            path.each do |component, continued_path|
+                if component.start_with? '$$'
+                    replacement_value = replacement_value.gsub(component, component[1 .. -1])
+                elsif component.start_with? '$'
+                    replacement_value = replacement_value.gsub(component, device[component[1 .. -1]])
+                else
+                    replacement_value = replacement_value
+                end
+                if path.is_a?(Hash)
+                    replacement_value = _interpolate_value(continued_path, device, replacement_value)
+                end
+            end
+            replacement_value
+        end
+
         def _endpoint(device)
             @endpoint_fields.map { |field| device[field] }.reject { |e| e.nil? }.first
         end

data/lib/bjn_inventory/version.rb

@@ -1,3 +1,3 @@
 module BjnInventory
-  VERSION = "1.5.1"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bjn_inventory
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Jeremy Brinkley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonpath