kafo 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfbb4a616b18c65acd9ec41a140d96ecb4fbec247cb408416d4ce69c41c693b8
-  data.tar.gz: 5c77881bebac08faa217e5eff4ce173d43c7ef1cbb13ea40fc736b35b4786565
+  metadata.gz: 3ea658aadb5a4ad0c3e096e073d1d810b6deefa829a5105456ba30df27338f1a
+  data.tar.gz: '0812a0ddc530cc1e98aa6eabe4bdb2498834c24d4d5f6f3dd72d5057bfe338a9'
 SHA512:
-  metadata.gz: 6863e239a103139ceb283835fb1d30baffcd8756893ae0627ee97396f8acad8de9fe93124868ce4d5a724f0906587ec37517cd7179ce8c36d5252385afcbee2c
-  data.tar.gz: 9cd2571288e2847d66f781142e9d75b28c0dd7e7fb3b2e377e741128586bf79337032db98c524fd530b800154487f3a5f399ab037738f44394e1319fd967f932
+  metadata.gz: 16a1fada15bfd5a7301339e161b1a2bb88f30a15f428d58067e5ef9e5cc05d5e69d667063b6cb8846cc144ddfa1b46f4c584cbf2b1e7ea47b43554f521efc620
+  data.tar.gz: 2c4a224ad2a3dde11c370d456a8ea1668bdba7878f0a1ca80774e066e6b86158d57b915fd15350388794724932c7a8d9aabaca312b96749108665f03830c707a

data/lib/kafo/base_context.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Kafo
   class BaseContext
     def facts
@@ -24,12 +26,18 @@ module Kafo
 
     def self.facts
       @facts ||= begin
-        symbolize(JSON.load(`#{facter_path} --json`) || {})
+        result = run_command("#{facter_path} --json")
+        symbolize(JSON.load(result) || {})
       end
     end
 
     def self.facter_path
       @facter_path ||= PuppetCommand.search_puppet_path('facter')
     end
+
+    def self.run_command(command)
+      stdout, _stderr, _status = Open3.capture3(*PuppetCommand.format_command(command))
+      stdout
+    end
   end
 end

data/lib/kafo/configuration.rb

@@ -176,12 +176,16 @@ module Kafo
 EOS
 
         @logger.info 'Loading default values from puppet modules...'
-        command = PuppetCommand.new(dump_manifest, [], puppetconf, self).append('2>&1').command
-        result = `#{command}`
-        @logger.debug result
-        unless $?.exitstatus == 0
+        command = PuppetCommand.new(dump_manifest, [], puppetconf, self).command
+        stdout, stderr, status = Open3.capture3(*PuppetCommand.format_command(command))
+
+        @logger.debug stdout
+        @logger.debug stderr
+
+        unless status.success?
           log = app[:log_dir] + '/' + app[:log_name]
-          if (version_mismatch = /kafo_configure::puppet_version_failure: (.+?\))/.match(result))
+
+          if (version_mismatch = /kafo_configure::puppet_version_failure: (.+?\))/.match(stderr))
             puts version_mismatch[1]
             puts "Cannot continue due to incompatible version of Puppet. Use --skip-puppet-version-check to disable this check."
             @logger.error version_mismatch[1]
@@ -190,14 +194,15 @@ EOS
           else
             puts "Could not get default values, check log file at #{log} for more information"
             @logger.error command
-            @logger.error result
+            @logger.error stderr
             @logger.error 'Could not get default values, cannot continue'
             KafoConfigure.exit(:defaults_error)
           end
         end
+
         @logger.info "... finished"
 
-        load_yaml_from_output(result.split($/))
+        load_yaml_from_output(stdout.split($/))
       end
     end
 

data/lib/kafo/kafo_configure.rb

@@ -446,7 +446,7 @@ module Kafo
       begin
         command = PuppetCommand.new('include kafo_configure', options, puppetconf).command
         log_parser = PuppetLogParser.new
-        PTY.spawn(command) do |stdin, stdout, pid|
+        PTY.spawn(*PuppetCommand.format_command(command)) do |stdin, stdout, pid|
           begin
             stdin.each do |line|
               line = normalize_encoding(line)

data/lib/kafo/puppet_command.rb

@@ -35,12 +35,32 @@ module Kafo
     end
 
     def self.search_puppet_path(bin_name)
+      # Find the location of the puppet executable and use that to
+      # determine the path of all executables
       bin_path = (::ENV['PATH'].split(File::PATH_SEPARATOR) + ['/opt/puppetlabs/bin']).find do |path|
-        File.executable?(File.join(path, bin_name))
+        File.executable?(File.join(path, 'puppet')) && File.executable?(File.join(path, bin_name))
       end
       File.join([bin_path, bin_name].compact)
     end
 
+    def self.format_command(command)
+      if search_puppet_path('puppet').start_with?('/opt/puppetlabs')
+        [clean_env_vars, command, :unsetenv_others => true]
+      else
+        [::ENV, command, :unsetenv_others => false]
+      end
+    end
+
+    def self.clean_env_vars
+      # Cleaning ENV vars and keeping required vars only because,
+      # When using SCL it adds GEM_HOME and GEM_PATH ENV vars.
+      whitelisted_vars = %w[HOME USER LANG]
+
+      cleaned_env = ::ENV.select { |var| whitelisted_vars.include?(var) || var.start_with?('LC_') }
+      cleaned_env['PATH'] = '/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin'
+      cleaned_env
+    end
+
     private
 
     def manifest

data/lib/kafo/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 module Kafo
   PARSER_CACHE_VERSION = 1
-  VERSION = "4.0.1"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler