puppet-runner 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5bbb45769852b12c6bf2b83d523e33df37ae11e9
-  data.tar.gz: 047aad5ff68eb41b049047c1650f8777acfacc3c
+SHA256:
+  metadata.gz: 4f086089d8c2affa036b2a13590f65ddb9e6c2f8e4fd8bed75e889db6ad2dba1
+  data.tar.gz: 6407eb197c0bb1378a06fbc2c488c095a37cb9e172cc862a74dc8502883ad5be
 SHA512:
-  metadata.gz: bcceeb628caf19858c9c8486edad72001f9695d9b8ddafc3da10c9b407e54ce5a4c52812c88af876dee24d416aff200971d6f2851c4fe3b18ce46f0081ecd9ee
-  data.tar.gz: d03770227658b51eebe1e89ab9d8225185e07bb19448b25d1f102f50f3e9c650b83ed1f4ad777b7d7dcd4b0465a256ffd01d48f71e7764db4d228f6ac109654f
+  metadata.gz: 60c425bb861d0de9d71cd706be3494eacce00197c2a5dddc2b9446fc03479f835ca1b3cb374df78729dec855a8c020979760ecf38d8b9cc3c1da8a02fb9a53de
+  data.tar.gz: 732de9de032ab030d56871cb02c04b4c9eeaa72560696dcb7e70d5d62a206cb1adc99dabd5ac63738900c6655aa126ec77b5615831baf989337b1218b93c7afb

data/bin/puppet-runner

@@ -21,6 +21,7 @@ require 'deep_merge'
 require 'docopt'
 require 'colorize'
 require 'facter'
+require 'avst/string_ext'
 
 doc = <<DOCOPT
 Adaptavist puppet runner
@@ -95,6 +96,22 @@ def extract_comment_from_hash(input)
   res
 end
 
+def extract_type_from_hash(input)
+  res = {}
+  if input
+    res = input.map{|key, val|
+      if val != nil
+        type = 'string'
+        if val.is_a?(Hash) and  val["type"] != nil
+           type = val["type"]
+        end
+      end
+      {key => type }
+    }
+  end
+  res
+end
+
 begin
     options = Docopt::docopt(doc)
 rescue Docopt::Exit => e
@@ -150,6 +167,7 @@ if options['all'] || options['prepare']
     prefixed_facts_comments = {}
     puppetfile_config = YAML.load_file(puppetfile_config_path) || {}
     puppetfile_dependencies = []
+    global_transform_data = []
       # functionalities:
       # # In honor of Henry... 
       #   1_app:
@@ -189,6 +207,19 @@ if options['all'] || options['prepare']
 
             fact_comments_as_string = extract_comment_from_hash(default_facts).to_s
             
+            # get a list of each fields type if set (if not they will report as strings)
+            data_type = extract_type_from_hash(default_facts)
+
+            # Check to see if any of the fields are booleans, if so add an entry to the transform_data array
+            transform_data = []
+            data_type.each do | field|
+              field.each do | field_name, field_type |
+                if field_type == 'boolean'
+                  transform_data << field_name
+                end
+              end
+            end
+            
             if to_add.is_a?(Hash)
               # if prefixes are not defined skip replacing
               if prefixes
@@ -205,6 +236,7 @@ if options['all'] || options['prepare']
                         facts_as_string = facts_as_string.gsub(/#{prefix}/, "#{replace_prefixes_with}")
                         fact_comments_as_string = fact_comments_as_string.gsub(/#{prefix}/, "#{replace_prefixes_with}")
                         prefixed_required_facts = prefixed_required_facts.merge(required_facts.map! { |item| item.gsub(/#{prefix}/, "#{replace_prefixes_with}") })
+                        transform_data = transform_data.map {|s| s.gsub(/#{prefix}/, "#{replace_prefixes_with}")} if !transform_data.empty?
                       end
                     end
                   end
@@ -217,6 +249,7 @@ if options['all'] || options['prepare']
                     facts_as_string = facts_as_string.gsub(/#{prefix}/, "#{replace_prefixes_with}")
                     fact_comments_as_string = fact_comments_as_string.gsub(/#{prefix}/, "#{replace_prefixes_with}")
                     prefixed_required_facts = prefixed_required_facts.merge(required_facts.map! { |item| item.gsub(/#{prefix}/, "#{replace_prefixes_with}") })
+                    transform_data = transform_data.map {|s| s.gsub(/#{prefix}/, "#{replace_prefixes_with}")} if !transform_data.empty?
                   end
                 end
               end
@@ -231,6 +264,9 @@ if options['all'] || options['prepare']
               default_fact_comments = extract_comment_from_hash(plain_facts)  
               prefixed_required_facts = prefixed_required_facts.merge(required_facts)
             end
+            # add the "local" transformation list to the global one
+            global_transform_data.push(*transform_data)
+
             result_template.deep_merge!(template)
             # default_facts_prefixed is Array of hashes as the result of map, this will create hash from it
             result_default_facts.merge!(default_facts_prefixed.reduce Hash.new, :merge)
@@ -240,10 +276,6 @@ if options['all'] || options['prepare']
           end
         end
       end
-      # Write results
-      File.open(output_file_path, 'w+') do |output_file|
-        YAML.dump(result_template, output_file)
-      end
       custom_facts_path = path_join_glob(input_dir, "#{hostname}_facts.yaml")
       custom_facts = YAML.load_file(custom_facts_path) || {}
       File.open(output_encrypted_facts_file_path, 'w+') do |output_file|
@@ -254,6 +286,29 @@ if options['all'] || options['prepare']
           end
         end
         output_file.write(output_result_default_facts)
+
+        # now that the merged final facts are present look for any global transformations to apply 
+        # global transformations are currently just booleans that need to be expressed directly in output file
+        if !global_transform_data.empty?
+          result_template = result_template.to_s
+          all_facts = YAML.load(output_result_default_facts)
+          global_transform_data.each do | transform_value |
+            debug "Attempting to replace boolean value for fact #{transform_value}"
+            begin
+              # convert the final template to a string, replace any facts that are booleans with their actual value and then convert the result bacl to YAML
+              # convert the fact to boolean and then back to string during the replace, this allows validation that the fact is actually a boolean
+              result_template = result_template.gsub(/\"\%{::#{transform_value}}\"/, all_facts[transform_value].to_bool.to_s)
+            rescue
+              warning "Unable to convert fact #{transform_value} with value #{all_facts[transform_value]} into boolean, conversion will be skipped"
+            end
+          end
+          result_template = eval(result_template)
+        end
+      end
+
+      # Write results
+      File.open(output_file_path, 'w+') do |output_file|
+        YAML.dump(result_template, output_file)
       end
       
       # decrypt facts file because Puppet doesn't appear to be able to read encrypted facts
@@ -298,7 +353,14 @@ if options['all'] || options['prepare']
         end
         output_file.write(decrypted.join)
       end
+
+      begin
+        FileUtils.rm output_encrypted_facts_file_path
+      rescue
+        warning "Unable to remove tmp encrypted facts file #{output_encrypted_facts_file_path}"
+      end
       
+      # create puppetfile from the dictionary
       File.open(puppetfile_output_path, 'w+') do |output_file|
         header = "#!/usr/bin/env ruby\n\n"
         output_file.write(header)
@@ -348,3 +410,4 @@ if (options['start'] || options['all']) && !stop_apply
     end
 end
 
+

data/lib/avst/string_ext.rb

@@ -0,0 +1,7 @@
+class String
+    def to_bool
+        return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
+        return false if self == false || self.empty? || self.nil? || self =~ (/(false|f|no|n|0)$/i)
+        raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+    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.18"
+  spec.version       = "0.0.19"
   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.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,6 +140,7 @@ files:
 - README.md
 - Rakefile
 - bin/puppet-runner
+- lib/avst/string_ext.rb
 - puppet-runner.gemspec
 - test/configs/defaults/confluence.yaml
 - test/configs/defaults/connector_proxy.yaml
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Preprocessor for hiera config