puppet-runner 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9608033a0b9eb159ab03971282ba58f6f66048dca66b7dd010d6ba8eeb19a8c1
-  data.tar.gz: 10fa57c840b21b088c9e36c6d4415de4c90f260da7aacf4a9afb50bde6c8d420
+SHA1:
+  metadata.gz: 0f8efcfb59ec97544f71bd48cef975038d26309d
+  data.tar.gz: c79062ae1be29f79cde741a014b8a66997ed1504
 SHA512:
-  metadata.gz: 0b5a94a383db7ed9236316a79ec462af20e4de9d71d023342d44ec4dedb52bfb99d5a3f5fd7c78f9e41a488cfbfe1652c7a8809bc9ab59affe57fe90c619e9d8
-  data.tar.gz: 87767da63ef9b57dd99de76bf5946e258be53c8f62d3d5502b4c14b0007de762625f401f7bfe2afede26346ef5c1c53f461fb73411ecf4814dcf8c9442bd9f14
+  metadata.gz: 9968eaf857daa85f81af9cd69bd76095a0845888787af4298383e6ed466d91c75d6d7e6e499ac56360d5d181d0daf8a0e121d9d8cafa7735b27b5c4d7f38eacd
+  data.tar.gz: c3d6892856cda4d15562deac8c53396694472185b8c2d17bdb9b8ea8a87c74026ffc28aa4546d679ffad2467826d398edb89fb557d948e497db010123177c7b7

data/bin/puppet-runner

@@ -118,7 +118,7 @@ def extract_type_from_hash(input)
 end
 
 # function to resolve inter fact references, it should return the last fact name (not value)
-def resolve_fact(fact_name, max_depth=5, current_depth=0)
+def resolve_fact(fact_name, max_depth=5, current_depth=0, return_fact_value=false)
   final_val = nil
   fact_name = fact_name.sub(/%{::/,'').sub(/}/,'')
   if max_depth == current_depth
@@ -132,7 +132,8 @@ def resolve_fact(fact_name, max_depth=5, current_depth=0)
     elsif val.instance_of?(String) and val.match(/%{::.*.}/)
       val = resolve_fact(val,max_depth, current_depth + 1)
     else
-      val = "%{::#{fact_name}}"
+      # if we have not been told to return the fact value, then return the fact key, else the value wil be returned
+      val = "%{::#{fact_name}}" if return_fact_value == false
     end
     final_val = val
   end
@@ -333,8 +334,17 @@ if options['all'] || options['prepare']
             # find each instance of a fact within the value (it may contain multiple facts
             # i.e "TEST%{::fact1}TEST%{::fact2}"
             fact_val.gsub(/}/,"}\n").scan(/%{::.*.}/).each do | fact |
-              # resolve the fact down to its last reference to another fact (not the end value)
-              resolved_fact = resolve_fact(fact)
+              # if the fact is part of a larger string set a flag to tell resolve_fact 
+              # to return the final fact value instead of the finalfact key!
+              if fact.length != fact_val.length
+                  return_fact_value = true
+              else
+                  return_fact_value = false
+              end
+
+              # resolve the fact down to its last reference to another fact (not the end value) if return_fact_value is false
+              # or down to the end value if return_fact_value is true
+              resolved_fact = resolve_fact(fact, 5, 0, return_fact_value)
               # if the resolved fact name is not the same as the original fact we found referenced
               # then replace the value in fact_val
               if !resolved_fact.nil? and resolved_fact != fact
@@ -344,7 +354,7 @@ if options['all'] || options['prepare']
             debug "Attempting to replace fact '#{fact_key}' with value '#{fact_val}' in compiled template"
             # replace the original fact reference in the template with the resovled value
             # this is done before global teansformation as they may change the final value again
-            result_template = result_template.gsub(/\"\%{::#{fact_key}}\"/, "\"#{fact_val}\"")
+            result_template = result_template.gsub(/\%{::#{fact_key}}/, "#{fact_val}")
           end
         end
 

data/puppet-runner.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "puppet-runner"
-  spec.version       = "0.0.26"
+  spec.version       = "0.0.27"
   spec.authors       = ["Martin Brehovsky", "Matthew Hope"]
   spec.email         = ["mbrehovsky@adaptavist.com"]
   spec.summary       = %q{Preprocessor for hiera config}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,7 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Preprocessor for hiera config