hiera-ic-yaml 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5d4c5cb99fa3c85ab258b871bdc9605e2285e4
-  data.tar.gz: f2c2bf38bb3d9144679c94e3855429ff5b218482
+  metadata.gz: e418a38e390221e8500056205e0811dc1cfbda04
+  data.tar.gz: 628d2addfffe9f72c1c1bb0211a7761fc6ef2e55
 SHA512:
-  metadata.gz: b40b446b4f5197c66d791cd2ddbd7206f97ae81826594026ed431e500a063d6f3bcb958a48ab3c47746732b1fef42136a15e32b47bc0e7d424f46322e6d548d3
-  data.tar.gz: e49ca2e15c9ff4d4ea6d27728b9bca00ff3567db718a077be7d758c9d97055a7f0d74a2a51e4a89c1b909707a2f734d4cb96bef6df287f98742a9bb874ae4293
+  metadata.gz: 7d78fd29a5353ec10e133455fb818c5639e6cf47ebec740d79c8e406efcebf4cc39220018e7b1a1909b303e26145879fb00a09530c203250cb2c6bcce16d1ae8
+  data.tar.gz: 793d7deb1eb0681162d230035e24777f28b6e33db9693a62ea24b22f899c07915f5fef2765114493b4dcb7071d5b127a1100b259f7adfcf99174a27abded722c

data/lib/hiera/backend/ic_yaml_backend.rb

@@ -1,8 +1,6 @@
 class Hiera
   module Backend
-
     class Ic_yaml_backend
-
       def initialize(cache=nil)
         require 'yaml'
         Hiera.debug("Hiera IC YAML backend starting")
@@ -33,6 +31,18 @@ class Hiera
         return file
       end
 
+      def parameters(data)
+        key        = parameters_key()
+        values     = data[key] || {}
+        parameters = {}
+
+        values.each_pair do |k,v|
+          parameters["::#{k}"] = v
+        end
+
+        return parameters
+      end
+
       def imports_key()
         config = ic_yaml_config()
 
@@ -47,8 +57,42 @@ class Hiera
         return '__imports__'
       end
 
+      def parameters_key()
+        config = ic_yaml_config()
+
+        if config[:parameters_key]
+            return config[:parameters_key]
+        end
+
+        if config['parameters_key']
+            return config['parameters_key']
+        end
+
+        return '__parameters__'
+      end
+
       def merge_yaml(overriding, other)
-         Backend.merge_answer(overriding, other)
+
+        if !overriding.kind_of?(Hash) && !overriding.kind_of?(Array)
+            return overriding || other
+        end
+
+        if overriding.kind_of?(Array) && other.kind_of?(Array)
+            return overriding.concat(other).uniq
+        end
+
+        if !overriding.kind_of?(Hash)
+            return overriding || other
+        end
+
+        result = {}
+
+        overriding.each_pair do |key, overriding_val|
+          other_val   = other[key] || overriding_val
+          result[key] = merge_yaml(overriding_val, other_val)
+        end
+
+        return other.merge(result)
       end
 
       def load_yaml_file(path, scope)
@@ -76,7 +120,8 @@ class Hiera
             imports = {}
 
             config[imports_key].each { |f|
-               imports = merge_yaml(load_yaml_file(f, scope), imports)
+                element = load_yaml_file(f, scope)
+                imports = merge_yaml(element, imports)
             }
 
             config = merge_yaml(config, imports)
@@ -91,7 +136,11 @@ class Hiera
 
         Hiera.debug("Hiera IC YAML Looking up #{key} in YAML backend")
 
-        Backend.datasourcefiles(:ic_yaml, scope, "yaml", order_override) do |source, yamlfile|
+        Backend.datasources(scope, order_override) do |source|
+          Hiera.debug("Looking for data source #{source}")
+          yamlfile = Backend.datafile(:ic_yaml, scope, source, "yaml") || next
+
+          next unless File.exist?(yamlfile)
 
           data = @cache.read_file(yamlfile, Hash) do |data|
             load_yaml_data(data, scope)
@@ -111,7 +160,7 @@ class Hiera
           # the array
           #
           # for priority searches we break after the first found data item
-          new_answer = Backend.parse_answer(data[key], scope)
+          new_answer = Backend.parse_answer(data[key], scope, parameters(data))
           case resolution_type
           when :array
             raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
@@ -129,12 +178,6 @@ class Hiera
 
         return answer
       end
-
-      private
-
-      def file_exists?(path)
-        File.exist? path
-      end
     end
   end
 end

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: hiera-ic-yaml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Fabio B. Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
-dependencies: []
-description: Hiera yaml backend that support imports
+date: 2014-12-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: hiera
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+description: Hiera yaml backend that support imports and parameters
 email: fabio.bat.silva@gmail.com
 executables: []
 extensions: []