Interpolate also node variables, not just vars map

Fixes #583
ytti · Oct 12, 2016 · 6612535 · 6612535
1 parent 201b68d
commit 6612535
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
@@ -25,7 +25,7 @@ def load
       # map node parameters
       keys = {}
       @cfg.map.each do |key, position|
-        keys[key.to_sym] = data[position]
+        keys[key.to_sym] = node_var_interpolate data[position]
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 

diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
@@ -39,7 +39,7 @@ def load
       # map node parameters
       keys = {}
       @cfg.map.each do |key, position|
-        keys[key.to_sym] = line[position]
+        keys[key.to_sym] = node_var_interpolate line[position]
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 

diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
@@ -26,7 +26,7 @@ def load
     query.each do |node|
       # map node parameters
       keys = {}
-      @cfg.map.each { |key, sql_column| keys[key.to_sym] = node[sql_column.to_sym] }
+      @cfg.map.each { |key, sql_column| keys[key.to_sym] = node_var_interpolate node[sql_column.to_sym] }
       keys[:model] = map_model keys[:model] if keys.key? :model
 
       # map node specific vars