bolt 0.21.4 → 0.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d6e90b40ddb51ff8c5b4817ba930417ec7aec118a63e8b585b38d6a5555040
-  data.tar.gz: 3e99e5ba914908058503d1feb9bd8fe5331474288d863ec158a798142b0f41be
+  metadata.gz: 1736c46973051ce64d6c27c43c9d34e63c4c6f05f5d5017f2df51796669500e4
+  data.tar.gz: da561ef33b65849c91f625fc465e89d7d7d7709bf6e1493b8fff6d5d954884c6
 SHA512:
-  metadata.gz: 9e7d9c78f78df1dffa0e4288cefa10216182091c16b70ace73b6e1a766a4ebff7fc6cedb403b9794851c844b9050c63a13f1beb137a87e5f53af2c9b2de7af54
-  data.tar.gz: 1edc8a0cb84632e703a9c2b0e50d6478cdbb2e5a56e0bb7bc06e9395e6dba1bcbc7232423eca87afef58f904c5922af782041079070b819f08d5228dbb3c029b
+  metadata.gz: ff4aafb9c30b0e00fb89482ff864f8a85bf8c33cbdc2a8a6a1a41301029a14f79fa6580009e1621bcd223fc035c3eea44faae7b39b575a325fb61b8d3a99cc9d
+  data.tar.gz: eafccbd22e39d5db8e8e0f2bb70ec7ac02f3bfc18085c30fd826e30e59a9c19be5be5c01530e43e94e8e0396d3911d5e0de53e65647acc68c84b4a4b35a5a131

data/bolt-modules/boltlib/lib/puppet/functions/apply_prep.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+Puppet::Functions.create_function(:apply_prep) do
+  dispatch :apply_prep do
+    param 'Boltlib::TargetSpec', :targets
+  end
+
+  def apply_prep(target_spec)
+    applicator = Puppet.lookup(:apply_executor) { nil }
+    executor = Puppet.lookup(:bolt_executor) { nil }
+    inventory = Puppet.lookup(:bolt_inventory) { nil }
+    unless applicator && executor && inventory && Puppet.features.bolt?
+      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
+        Puppet::Pops::Issues::TASK_MISSING_BOLT, action: _('apply_prep')
+      )
+    end
+
+    executor.report_function_call('apply_prep')
+
+    targets = inventory.get_targets(target_spec)
+
+    executor.log_action('install puppet and gather facts', targets) do
+      executor.without_default_logging do
+        script_compiler = Puppet::Pal::ScriptCompiler.new(closure_scope.compiler)
+
+        # Ensure Puppet is installed
+        version_task = script_compiler.task_signature('puppet_agent::version')
+        raise Bolt::Error.new('puppet_agent::version could not be found', 'bolt/apply-prep') unless version_task
+        versions = executor.run_task(targets, version_task.task, {})
+        raise Bolt::RunFailure.new(versions, 'run_task', version_task.name) unless versions.ok?
+        need_install, installed = versions.partition { |r| r['version'].nil? }
+        installed.each do |r|
+          Puppet.info "Puppet Agent #{r['version']} installed on #{r.target.name}"
+        end
+
+        unless need_install.empty?
+          install_task = script_compiler.task_signature('puppet_agent::install')
+          raise Bolt::Error.new('puppet_agent::install could not be found', 'bolt/apply-prep') unless install_task
+          installed = executor.run_task(need_install.map(&:target), install_task.task, {})
+          raise Bolt::RunFailure.new(installed, 'run_task', install_task.name) unless installed.ok?
+        end
+        targets.each { |target| inventory.set_feature(target, 'puppet-agent') }
+
+        # Gather facts, including custom facts
+        plugins = applicator.build_plugin_tarball do |mod|
+          search_dirs = []
+          search_dirs << mod.plugins if mod.plugins?
+          search_dirs << mod.pluginfacts if mod.pluginfacts?
+          search_dirs
+        end
+
+        task = applicator.custom_facts_task
+        results = executor.run_task(targets, task, 'plugins' => plugins)
+        raise Bolt::RunFailure.new(results, 'run_task', task.name) unless results.ok?
+
+        results.each do |result|
+          inventory.add_facts(result.target, result.value)
+        end
+      end
+    end
+
+    # Return nothing
+    nil
+  end
+end

data/bolt-modules/boltlib/lib/puppet/functions/facts.rb

@@ -14,12 +14,6 @@ Puppet::Functions.create_function(:facts) do
   end
 
   def facts(target)
-    unless Puppet[:tasks]
-      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
-        Puppet::Pops::Issues::TASK_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, operation: 'facts'
-      )
-    end
-
     inventory = Puppet.lookup(:bolt_inventory) { nil }
 
     unless inventory

data/bolt-modules/boltlib/lib/puppet/functions/get_targets.rb

@@ -22,12 +22,6 @@ Puppet::Functions.create_function(:get_targets) do
   end
 
   def get_targets(names)
-    unless Puppet[:tasks]
-      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
-        Puppet::Pops::Issues::TASK_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, operation: 'get_targets'
-      )
-    end
-
     inventory = Puppet.lookup(:bolt_inventory) { nil }
 
     unless inventory && Puppet.features.bolt?

data/bolt-modules/boltlib/lib/puppet/functions/vars.rb

@@ -18,12 +18,6 @@ Puppet::Functions.create_function(:vars) do
   end
 
   def vars(target)
-    unless Puppet[:tasks]
-      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
-        Puppet::Pops::Issues::TASK_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, operation: 'vars'
-      )
-    end
-
     inventory = Puppet.lookup(:bolt_inventory) { nil }
 
     unless inventory

data/bolt-modules/boltlib/lib/puppet/functions/without_default_logging.rb

@@ -23,12 +23,8 @@ Puppet::Functions.create_function(:without_default_logging) do
     executor = Puppet.lookup(:bolt_executor) { nil }
     executor.report_function_call('without_default_logging')
 
-    old_log = executor.plan_logging
-    executor.plan_logging = false
-    begin
+    executor.without_default_logging do
       yield
-    ensure
-      executor.plan_logging = old_log
     end
   end
 end

data/lib/bolt/applicator.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require 'base64'
+require 'concurrent'
+require 'find'
 require 'json'
 require 'logging'
+require 'minitar'
 require 'open3'
-require 'concurrent'
 require 'bolt/util/puppet_log_level'
 
 module Bolt
@@ -19,12 +22,28 @@ module Bolt
 
       @pool = Concurrent::ThreadPoolExecutor.new(max_threads: max_compiles)
       @logger = Logging.logger[self]
+      @plugin_tarball = Concurrent::Delay.new do
+        build_plugin_tarball do |mod|
+          search_dirs = []
+          search_dirs << mod.plugins if mod.plugins?
+          search_dirs << mod.files if mod.files?
+          search_dirs
+        end
+      end
     end
 
     private def libexec
       @libexec ||= File.join(Gem::Specification.find_by_name('bolt').gem_dir, 'libexec')
     end
 
+    def custom_facts_task
+      @custom_facts_task ||= begin
+        path = File.join(libexec, 'custom_facts.rb')
+        impl = { 'name' => 'custom_facts.rb', 'path' => path, 'requirements' => [], 'supports_noop' => true }
+        Task.new('custom_facts', [impl], 'stdin')
+      end
+    end
+
     def catalog_apply_task
       @catalog_apply_task ||= begin
         path = File.join(libexec, 'apply_catalog.rb')
@@ -46,11 +65,11 @@ module Bolt
           facts: @inventory.facts(target),
           variables: @inventory.vars(target).merge(plan_vars),
           trusted: trusted.to_h
-        }
+        },
+        inventory: @inventory.data_hash
       }
 
       bolt_catalog_exe = File.join(libexec, 'bolt_catalog')
-
       old_path = ENV['PATH']
       ENV['PATH'] = "#{RbConfig::CONFIG['bindir']}#{File::PATH_SEPARATOR}#{old_path}"
       out, err, stat = Open3.capture3('ruby', bolt_catalog_exe, 'compile', stdin_data: catalog_input.to_json)
@@ -144,6 +163,8 @@ module Bolt
       type0 = Puppet.lookup(:pal_script_compiler).type('TargetSpec')
       Puppet::Pal.assert_type(type0, args[0], 'apply targets')
 
+      @executor.report_function_call('apply')
+
       options = {}
       if args.count > 1
         type1 = Puppet.lookup(:pal_script_compiler).type('Hash[String, Data]')
@@ -171,7 +192,7 @@ module Bolt
         result_promises = targets.zip(futures).flat_map do |target, future|
           @executor.queue_execute([target]) do |transport, batch|
             @executor.with_node_logging("Applying manifest block", batch) do
-              arguments = { 'catalog' => future.value, '_noop' => options['_noop'] }
+              arguments = { 'catalog' => future.value, 'plugins' => plugins, '_noop' => options['_noop'] }
               raise future.reason if future.rejected?
               result = transport.batch_task(batch, catalog_apply_task, arguments, options, &notify)
               result = provide_puppet_missing_errors(result)
@@ -188,5 +209,45 @@ module Bolt
       end
       r
     end
+
+    def plugins
+      @plugin_tarball.value ||
+        raise(Bolt::Error.new("Failed to pack module plugins: #{@plugin_tarball.reason}", 'bolt/plugin-error'))
+    end
+
+    def build_plugin_tarball
+      start_time = Time.now
+      sio = StringIO.new
+      output = Minitar::Output.new(Zlib::GzipWriter.new(sio))
+
+      Puppet.lookup(:current_environment).modules.each do |mod|
+        search_dirs = yield mod
+
+        parent = Pathname.new(mod.path).parent
+        files = Find.find(*search_dirs).select { |file| File.file?(file) }
+
+        files.each do |file|
+          tar_path = Pathname.new(file).relative_path_from(parent)
+          @logger.debug("Packing plugin #{file} to #{tar_path}")
+          stat = File.stat(file)
+          content = File.binread(file)
+          output.tar.add_file_simple(
+            tar_path.to_s,
+            data: content,
+            size: content.size,
+            mode: stat.mode & 0o777,
+            mtime: stat.mtime
+          )
+        end
+      end
+
+      duration = Time.now - start_time
+      @logger.debug("Packed plugins in #{duration * 1000} ms")
+
+      output.close
+      Base64.encode64(sio.string)
+    ensure
+      output&.close
+    end
   end
 end

data/lib/bolt/catalog.rb

@@ -51,6 +51,19 @@ module Bolt
       end
     end
 
+    def setup_inventory(inventory)
+      config = Bolt::Config.default
+      config.overwrite_transport_data(inventory['config']['transport'],
+                                      Bolt::Util.symbolize_top_level_keys(inventory['config']['transports']))
+
+      bolt_inventory = Bolt::Inventory.new(inventory['data'],
+                                           config,
+                                           Bolt::Util.symbolize_top_level_keys(inventory['target_hash']))
+
+      bolt_inventory.collect_groups
+      bolt_inventory
+    end
+
     def compile_catalog(request)
       pal_main = request['code_ast'] || request['code_string']
       target = request['target']
@@ -69,7 +82,10 @@ module Bolt
           node = Puppet.lookup(:pal_current_node)
           setup_node(node, target["trusted"])
 
-          Puppet.override(pal_main: pal_main, bolt_pdb_client: pdb_client) do
+          Puppet.override(pal_main: pal_main,
+                          bolt_pdb_client: pdb_client,
+                          bolt_inventory:
+                          setup_inventory(request['inventory'])) do
             compile_node(node)
           end
         end

data/lib/bolt/config.rb

@@ -106,6 +106,15 @@ module Bolt
       validate
     end
 
+    def overwrite_transport_data(transport, transports)
+      @transport = transport
+      @transports = transports
+    end
+
+    def transport_data_get
+      { transport: @transport, transports: @transports }
+    end
+
     def deep_clone
       Bolt::Util.deep_clone(self)
     end

data/lib/bolt/executor.rb

@@ -16,7 +16,7 @@ require 'bolt/puppetdb'
 module Bolt
   class Executor
     attr_reader :noop, :transports
-    attr_accessor :run_as, :plan_logging
+    attr_accessor :run_as
 
     def initialize(concurrency = 1,
                    analytics = Bolt::Analytics::NoopClient.new,
@@ -244,5 +244,13 @@ module Bolt
     def finish_plan(plan_result)
       transport('pcp').finish_plan(plan_result)
     end
+
+    def without_default_logging
+      old_log = @plan_logging
+      @plan_logging = false
+      yield
+    ensure
+      @plan_logging = old_log
+    end
   end
 end

data/lib/bolt/inventory.rb

@@ -53,16 +53,16 @@ module Bolt
       inventory
     end
 
-    def initialize(data, config = nil)
+    def initialize(data, config = nil, target_vars: {}, target_facts: {}, target_features: {})
       @logger = Logging.logger[self]
       # Config is saved to add config options to targets
       @config = config || Bolt::Config.default
       @data = data ||= {}
       @groups = Group.new(data.merge('name' => 'all'))
       @group_lookup = {}
-      @target_vars = {}
-      @target_facts = {}
-      @target_features = {}
+      @target_vars = target_vars
+      @target_facts = target_facts
+      @target_features = target_features
     end
 
     def validate
@@ -123,6 +123,18 @@ module Bolt
       @target_features[target.name] || Set.new
     end
 
+    def data_hash
+      {
+        data: @data,
+        target_hash: {
+          target_vars: @target_vars,
+          target_facts: @target_facts,
+          target_features: @target_features
+        },
+        config: @config.transport_data_get
+      }
+    end
+
     #### PRIVATE ####
     #
     # For debugging only now

data/lib/bolt/inventory/group.rb

@@ -9,30 +9,54 @@ module Bolt
 
       def initialize(data)
         @logger = Logging.logger[self]
-        @name = data['name']
-        @nodes = {}
 
-        data['nodes']&.each do |n|
-          n = { 'name' => n } if n.is_a? String
-          if @nodes.include? n['name']
-            @logger.warn("Ignoring duplicate node in #{@name}: #{n}")
+        unless data.is_a?(Hash)
+          raise ValidationError.new("Expected group to be a Hash, not #{data.class}", nil)
+        end
+
+        if data.key?('name')
+          if data['name'].is_a?(String)
+            @name = data['name']
+          else
+            raise ValidationError.new("Group name must be a String, not #{data['name'].inspect}", nil)
+          end
+        else
+          raise ValidationError.new("Group does not have a name", nil)
+        end
+
+        @vars = fetch_value(data, 'vars', Hash)
+        @facts = fetch_value(data, 'facts', Hash)
+        @features = fetch_value(data, 'features', Array)
+        @config = fetch_value(data, 'config', Hash)
+
+        nodes = fetch_value(data, 'nodes', Array)
+        groups = fetch_value(data, 'groups', Array)
+
+        @nodes = {}
+        nodes.each do |node|
+          node = { 'name' => node } if node.is_a? String
+          unless node.is_a?(Hash)
+            raise ValidationError.new("Node entry must be a String or Hash, not #{node.class}", @name)
+          end
+          if @nodes.include? node['name']
+            @logger.warn("Ignoring duplicate node in #{@name}: #{node}")
           else
-            @nodes[n['name']] = n
+            @nodes[node['name']] = node
           end
         end
 
-        @vars = data['vars'] || {}
-        @facts = data['facts'] || {}
-        @features = data['features'] || []
-        @config = data['config'] || {}
-        @groups = if data['groups']
-                    data['groups'].map { |g| Group.new(g) }
-                  else
-                    []
-                  end
+        @groups = groups.map { |g| Group.new(g) }
 
         # this allows arbitrary info for the top level
-        @rest = data.reject { |k, _| %w[name nodes config groups].include? k }
+        @rest = data.reject { |k, _| %w[name nodes config groups vars facts features].include? k }
+      end
+
+      def fetch_value(data, key, type)
+        value = data.fetch(key, type.new)
+        unless value.is_a?(type)
+          raise ValidationError.new("Expected #{key} to be of type #{type}, not #{value.class}", @name)
+        end
+        value
       end
 
       def check_deprecated_config(context, name, config)
@@ -44,11 +68,10 @@ module Bolt
       end
 
       def validate(used_names = Set.new, node_names = Set.new, depth = 0)
-        raise ValidationError.new("Group does not have a name", nil) unless @name
         if used_names.include?(@name)
           raise ValidationError.new("Tried to redefine group #{@name}", @name)
         end
-        raise ValidationError.new("Invalid Group name #{@name}", @name) unless @name =~ /\A[a-z0-9_]+\Z/
+        raise ValidationError.new("Invalid group name #{@name}", @name) unless @name =~ /\A[a-z0-9_]+\Z/
 
         if node_names.include?(@name)
           raise ValidationError.new("Group #{@name} conflicts with node of the same name", @name)

data/lib/bolt/result_set.rb

@@ -27,6 +27,7 @@ module Bolt
 
     def each
       @results.each { |r| yield r }
+      self
     end
 
     def result_hash

data/lib/bolt/transport/winrm/connection.rb

@@ -109,99 +109,6 @@ $ENV:RUBYLIB
 Add-Type -AssemblyName System.ServiceModel.Web, System.Runtime.Serialization
 $utf8 = [System.Text.Encoding]::UTF8
 
-function Invoke-Interpreter
-{
-[CmdletBinding()]
-Param (
-  [Parameter()]
-  [String]
-  $Path,
-
-  [Parameter()]
-  [String]
-  $Arguments,
-
-  [Parameter()]
-  [Int32]
-  $Timeout,
-
-  [Parameter()]
-  [String]
-  $StdinInput = $Null
-)
-
-try
-{
-  if (-not (Get-Command $Path -ErrorAction SilentlyContinue))
-  {
-    throw "Could not find executable '$Path' in ${ENV:PATH} on target node"
-  }
-
-  $startInfo = New-Object System.Diagnostics.ProcessStartInfo($Path, $Arguments)
-  $startInfo.UseShellExecute = $false
-  $startInfo.WorkingDirectory = Split-Path -Parent (Get-Command $Path).Path
-  $startInfo.CreateNoWindow = $true
-  if ($StdinInput) { $startInfo.RedirectStandardInput = $true }
-  $startInfo.RedirectStandardOutput = $true
-  $startInfo.RedirectStandardError = $true
-
-  $stdoutHandler = { if (-not ([String]::IsNullOrEmpty($EventArgs.Data))) { $Host.UI.WriteLine($EventArgs.Data) } }
-  $stderrHandler = { if (-not ([String]::IsNullOrEmpty($EventArgs.Data))) { $Host.UI.WriteErrorLine($EventArgs.Data) } }
-  $invocationId = [Guid]::NewGuid().ToString()
-
-  $process = New-Object System.Diagnostics.Process
-  $process.StartInfo = $startInfo
-  $process.EnableRaisingEvents = $true
-
-  # https://msdn.microsoft.com/en-us/library/system.diagnostics.process.standarderror(v=vs.110).aspx#Anchor_2
-  $stdoutEvent = Register-ObjectEvent -InputObject $process -EventName 'OutputDataReceived' -Action $stdoutHandler
-  $stderrEvent = Register-ObjectEvent -InputObject $process -EventName 'ErrorDataReceived' -Action $stderrHandler
-  $exitedEvent = Register-ObjectEvent -InputObject $process -EventName 'Exited' -SourceIdentifier $invocationId
-
-  $process.Start() | Out-Null
-
-  $process.BeginOutputReadLine()
-  $process.BeginErrorReadLine()
-
-  if ($StdinInput)
-  {
-    $process.StandardInput.WriteLine($StdinInput)
-    $process.StandardInput.Close()
-  }
-
-  # park current thread until the PS event is signaled upon process exit
-  # OR the timeout has elapsed
-  $waitResult = Wait-Event -SourceIdentifier $invocationId -Timeout $Timeout
-  if (! $process.HasExited)
-  {
-    $Host.UI.WriteErrorLine("Process $Path did not complete in $Timeout seconds")
-    return 1
-  }
-
-  return $process.ExitCode
-}
-catch
-{
-  $Host.UI.WriteErrorLine($_)
-  return 1
-}
-finally
-{
-  @($stdoutEvent, $stderrEvent, $exitedEvent) |
-    ? { $_ -ne $Null } |
-    % { Unregister-Event -SourceIdentifier $_.Name }
-
-  if ($process -ne $Null)
-  {
-    if (($process.Handle -ne $Null) -and (! $process.HasExited))
-    {
-      try { $process.Kill() } catch { $Host.UI.WriteErrorLine("Failed To Kill Process $Path") }
-    }
-    $process.Dispose()
-  }
-}
-}
-
 function Write-Stream {
 PARAM(
   [Parameter(Position=0)] $stream,
@@ -408,30 +315,22 @@ PS
           raise
         end
 
-        # 10 minutes in seconds
-        DEFAULT_EXECUTION_TIMEOUT = 10 * 60
-
-        def execute_process(path = '', arguments = [], stdin = nil,
-                            timeout = DEFAULT_EXECUTION_TIMEOUT)
+        def execute_process(path = '', arguments = [], stdin = nil)
           quoted_args = arguments.map do |arg|
             "'" + arg.gsub("'", "''") + "'"
-          end.join(',')
-
+          end.join(' ')
+
+          exec_cmd =
+            if stdin.nil?
+              "& #{path} #{quoted_args}"
+            else
+              "@'\n#{stdin}\n'@ | & #{path} #{quoted_args}"
+            end
           execute(<<-PS)
-$quoted_array = @(
-  #{quoted_args}
-)
-
-$invokeArgs = @{
-  Path = "#{path}"
-  Arguments = $quoted_array -Join ' '
-  Timeout = #{timeout}
-  #{stdin.nil? ? '' : "StdinInput = @'\n" + stdin + "\n'@"}
-}
-
-# winrm gem checks $? prior to using $LASTEXITCODE
-# making it necessary to exit with the desired code to propagate status properly
-exit $(Invoke-Interpreter @invokeArgs)
+$OutputEncoding = [Console]::OutputEncoding
+#{exec_cmd}
+if (-not $? -and ($LASTEXITCODE -eq $null)) { exit 1 }
+exit $LASTEXITCODE
 PS
         end
 

data/lib/bolt/util.rb

@@ -117,6 +117,11 @@ module Bolt
       def windows?
         !!File::ALT_SEPARATOR
       end
+
+      # Accept hash and return hash with top level keys of type "String" converted to symbols.
+      def symbolize_top_level_keys(hsh)
+        hsh.each_with_object({}) { |(k, v), h| k.is_a?(String) ? h[k.to_sym] = v : h[k] = v }
+      end
     end
   end
 end

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '0.21.4'
+  VERSION = '0.21.5'
 end

data/libexec/apply_catalog.rb

@@ -4,6 +4,7 @@
 require 'json'
 require 'puppet'
 require 'puppet/configurer'
+require 'puppet/module_tool/tar'
 require 'tempfile'
 
 args = JSON.parse(STDIN.read)
@@ -39,23 +40,34 @@ Puppet[:skip_tags] = nil
 Puppet[:prerun_command] = nil
 Puppet[:postrun_command] = nil
 
-env = Puppet.lookup(:environments).get('production')
+Puppet[:default_file_terminus] = :file_server
 
-report = if Puppet::Util::Package.versioncmp(Puppet.version, '5.0.0') > 0
-           Puppet::Transaction::Report.new
-         else
-           Puppet::Transaction::Report.new('apply')
-         end
+exit_code = 0
+Dir.mktmpdir do |moduledir|
+  Tempfile.open('plugins.tar.gz') do |plugins|
+    File.binwrite(plugins, Base64.decode64(args['plugins']))
+    Puppet::ModuleTool::Tar.instance.unpack(plugins, moduledir, Etc.getlogin)
+  end
 
-Puppet.override(current_environment: env, loaders: Puppet::Pops::Loaders.new(env)) do
-  catalog = Puppet::Resource::Catalog.from_data_hash(args['catalog']).to_ral
-  catalog.environment = env.name.to_s
-  catalog.environment_instance = env
+  env = Puppet.lookup(:environments).get('production').override_with(modulepath: [moduledir])
 
-  configurer = Puppet::Configurer.new
-  configurer.run(catalog: catalog, report: report, pluginsync: false)
-end
+  report = if Puppet::Util::Package.versioncmp(Puppet.version, '5.0.0') > 0
+             Puppet::Transaction::Report.new
+           else
+             Puppet::Transaction::Report.new('apply')
+           end
+
+  Puppet.override(current_environment: env, loaders: Puppet::Pops::Loaders.new(env)) do
+    catalog = Puppet::Resource::Catalog.from_data_hash(args['catalog']).to_ral
+    catalog.environment = env.name.to_s
+    catalog.environment_instance = env
 
-puts JSON.pretty_generate(report.to_data_hash)
+    configurer = Puppet::Configurer.new
+    configurer.run(catalog: catalog, report: report, pluginsync: false)
+  end
+
+  puts JSON.pretty_generate(report.to_data_hash)
+  exit_code = report.exit_status != 1
+end
 
-exit report.exit_status != 1
+exit exit_code

data/libexec/bolt_catalog

@@ -16,6 +16,18 @@ require 'json'
 #     "facts": "Hash of facts to use for the node",
 #     "variables": "Hash of variables to use for compilation",
 #     "trusted": "Hash of trusted data for the node"
+#   },
+#   "inventory": JSON serialized information about inventory {
+#       "data": Data stored in inventory @data instance variable,
+#       "target_hash": {
+#         "target_vars": Vars that may have been updated plan,
+#         "target_facts": Facts that may have been updated in plan,
+#         "target_features": Features that may have been updated in plan,
+#       },
+#       "config": {
+#         "transport": Transport to use,
+#         "transports": Array of transport configs (note that transport keys are stringified)
+#       }
 #   }
 # }
 

data/libexec/custom_facts.rb

@@ -0,0 +1,44 @@
+#! /opt/puppetlabs/puppet/bin/ruby
+# frozen_string_literal: true
+
+require 'json'
+require 'puppet'
+require 'puppet/module_tool/tar'
+require 'tempfile'
+
+args = JSON.parse(STDIN.read)
+
+Dir.mktmpdir do |moduledir|
+  Tempfile.open('plugins.tar.gz') do |plugins|
+    File.binwrite(plugins, Base64.decode64(args['plugins']))
+    Puppet::ModuleTool::Tar.instance.unpack(plugins, moduledir, Etc.getlogin)
+  end
+
+  Puppet.initialize_settings
+  env = Puppet.lookup(:environments).get('production').override_with(modulepath: [moduledir])
+  env.each_plugin_directory do |dir|
+    $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
+  end
+
+  dirs = []
+  external_dirs = []
+  env.modules.each do |mod|
+    dirs << File.join(mod.plugins, 'facter') if mod.plugins?
+    external_dirs << mod.pluginfacts if mod.pluginfacts?
+  end
+
+  Facter.reset
+  Facter.search(*dirs) unless dirs.empty?
+  Facter.search_external(external_dirs)
+
+  if Puppet.respond_to? :initialize_facts
+    Puppet.initialize_facts
+  else
+    Facter.add(:puppetversion) do
+      setcode { Puppet.version.to_s }
+    end
+  end
+
+  puts(Facter.to_hash.to_json)
+end
+exit 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.21.5
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -289,6 +289,7 @@ files:
 - bolt-modules/boltlib/lib/puppet/datatypes/resultset.rb
 - bolt-modules/boltlib/lib/puppet/datatypes/target.rb
 - bolt-modules/boltlib/lib/puppet/functions/add_facts.rb
+- bolt-modules/boltlib/lib/puppet/functions/apply_prep.rb
 - bolt-modules/boltlib/lib/puppet/functions/facts.rb
 - bolt-modules/boltlib/lib/puppet/functions/fail_plan.rb
 - bolt-modules/boltlib/lib/puppet/functions/file_upload.rb
@@ -355,6 +356,7 @@ files:
 - lib/bolt_spec/plans/mock_executor.rb
 - libexec/apply_catalog.rb
 - libexec/bolt_catalog
+- libexec/custom_facts.rb
 - modules/aggregate/lib/puppet/functions/aggregate/count.rb
 - modules/aggregate/lib/puppet/functions/aggregate/nodes.rb
 - modules/aggregate/plans/count.pp