puppet-runner 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f086089d8c2affa036b2a13590f65ddb9e6c2f8e4fd8bed75e889db6ad2dba1
-  data.tar.gz: 6407eb197c0bb1378a06fbc2c488c095a37cb9e172cc862a74dc8502883ad5be
+  metadata.gz: 0ef7b7a722f72764a0d2b013624442fbf1a953a78f9ccd380d718209f53acf61
+  data.tar.gz: c060b7c2a5d188de60cda6afc41f9beb6e1693aed4966d609396596cbbdf6c57
 SHA512:
-  metadata.gz: 60c425bb861d0de9d71cd706be3494eacce00197c2a5dddc2b9446fc03479f835ca1b3cb374df78729dec855a8c020979760ecf38d8b9cc3c1da8a02fb9a53de
-  data.tar.gz: 732de9de032ab030d56871cb02c04b4c9eeaa72560696dcb7e70d5d62a206cb1adc99dabd5ac63738900c6655aa126ec77b5615831baf989337b1218b93c7afb
+  metadata.gz: 67de10395d2f7c802a5b00e8c0a15b2149a33514b1cbda0a811cdd34d97a108b5b343b142386918e6aa957ead50fcc0ffe38bc503a56d877bfd89d85faa243af
+  data.tar.gz: 864c05e7c5b9223d01fc09e1b43ae2925904542128b5ecd81310c60167706918a1768a833679f10fb545cb27850335f803c32fa5b49c282fc71588d679153be2

data/bin/puppet-runner

@@ -27,7 +27,7 @@ doc = <<DOCOPT
 Adaptavist puppet runner
 
 Usage:
-  puppet-runner (prepare|all) [-c CONFIG_DIR] [-t TEMPLATES] [-d DESTINATION_DIR] [-f FACTS_DEST] [-s SERVERNAME] [-p PUPPET_APPLY] [-r PUPPETFILE_CONFIG] [-o PUPPETFILE_OUTPUT_PATH] [-e EYAML_KEY_PATH]
+  puppet-runner (prepare|all) [-c CONFIG_DIR] [-t TEMPLATES] [-d DESTINATION_DIR] [-f FACTS_DEST] [-s SERVERNAME] [-p PUPPET_APPLY] [-r PUPPETFILE_CONFIG] [-o PUPPETFILE_OUTPUT_PATH] [-e EYAML_KEY_PATH] [-k]
   puppet-runner start [-p PUPPET_APPLY]
   puppet-runner -h | --help
 
@@ -42,6 +42,7 @@ Options:
   -r PUPPETFILE_CONFIG --puppetfile_config puppetfile_config                Puppetfile composition config file
   -o PUPPETFILE_OUTPUT_PATH --puppetfile_output_path PUPPETFILE_OUTPUT_PATH Result Puppetfile path
   -e EYAML_KEY_PATH --eyaml_key_path EYAML_KEY_PATH                         Path to eyaml encryption key pair
+  -k --keep-facts                                                           Flag to keep the encrypted facts file in /tmp for analysis
 Commands:
   all           Runs the following commands prepare, start 
   start         Runs puppet apply 
@@ -119,6 +120,7 @@ rescue Docopt::Exit => e
 end
 
 stop_apply = false
+keep_facts = false
 
 if options['all'] || options['prepare']
     input_dir = options["--config_dir"] || options["-c"] 
@@ -130,6 +132,7 @@ if options['all'] || options['prepare']
     eyaml_key_path = options["--eyaml_key_path"] || options["-e"] || "/etc/puppet/config"
     hostname = options["--servername"] || options["-s"] || Facter.value("hostname")
     puts "Hostname #{hostname}"
+    keep_facts = true if options["-k"] or options["--keep-facts"]
 
     config_file_path = path_join_glob(input_dir, hostname+".yaml")
     templates_dir = path_join_glob(templates, "templates")
@@ -278,6 +281,10 @@ if options['all'] || options['prepare']
       end
       custom_facts_path = path_join_glob(input_dir, "#{hostname}_facts.yaml")
       custom_facts = YAML.load_file(custom_facts_path) || {}
+
+      # add a fact for the localtion of facter
+      custom_facts['facter_file_location'] = output_facts_file_path
+
       File.open(output_encrypted_facts_file_path, 'w+') do |output_file|
         output_result_default_facts = result_default_facts.deep_merge!(custom_facts, {:merge_hash_arrays => true}).to_yaml
         prefixed_facts_comments.each do |pattern, replacement|
@@ -285,6 +292,7 @@ if options['all'] || options['prepare']
             output_result_default_facts.gsub!(/^#{pattern}/, "\##{replacement}\n#{pattern}")
           end
         end
+
         output_file.write(output_result_default_facts)
 
         # now that the merged final facts are present look for any global transformations to apply 
@@ -351,13 +359,20 @@ if options['all'] || options['prepare']
               end
             }
         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}"
+      # unless asked not to, attempt to remove the encrypted facts file
+      if keep_facts
+        debug "Removal of tmp encrypted facts file #{output_encrypted_facts_file_path} skipped at users request"
+      else
+        debug "Attempting to remove tmp encrypted facts file #{output_encrypted_facts_file_path}"
+        begin
+          FileUtils.rm output_encrypted_facts_file_path
+        rescue
+          warning "Unable to remove tmp encrypted facts file #{output_encrypted_facts_file_path}"
+        end
       end
       
       # create puppetfile from the dictionary
@@ -396,7 +411,7 @@ if options['all'] || options['prepare']
 end
 
 
-# start puppet 
+# start puppet
 if (options['start'] || options['all']) && !stop_apply
     require 'puppet'
     modulefile_definition = Gem::Version.new(Puppet.version) > Gem::Version.new('4.0.0') ? '--modulepath /etc/puppet/modules' : ''
@@ -405,9 +420,23 @@ if (options['start'] || options['all']) && !stop_apply
     debug "Running #{to_execute}"
     `#{to_execute}`
     exit_code = $?.exitstatus
+
+    # attempt to remove the fact file as its unencrypted (we do not care about exit status)
+    fact_file_location = Facter.value("facter_file_location")
+    if fact_file_location 
+      if File.file?(fact_file_location)
+        debug "Attempting to remove fact file #{fact_file_location}"
+        begin
+          FileUtils.rm fact_file_location
+        rescue
+          warning "Unable to remove facts file #{fact_file_location}.\nPlease urgently remove this as it holds unencrypted values"
+        end
+      end
+    else
+      warning "Unable to locate Facts file, please urgently locate and remove this as it holds unencrypted values"
+    end
+
     if exit_code != 2
       raise "execute_puppet exit status: #{exit_code}"
     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.19"
+  spec.version       = "0.0.20"
   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.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler