bolt 3.5.0 → 3.8.0

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

@@ -39,8 +39,6 @@ module Bolt
           end
         end
 
-        PAGEANT_NAME = "Pageant\0".encode(Encoding::UTF_16LE)
-
         def connect
           options = {
             logger: @transport_logger,
@@ -115,10 +113,9 @@ module Bolt
                 options[:use_agent] = false
               end
             elsif Bolt::Util.windows?
-              require 'Win32API' # case matters in this require!
-              # https://docs.microsoft.com/en-us/windows/desktop/api/winuser/nf-winuser-findwindoww
-              @find_window ||= Win32API.new('user32', 'FindWindowW', %w[P P], 'L')
-              if @find_window.call(nil, PAGEANT_NAME).to_i == 0
+              pageant = Net::SSH::Authentication::Pageant::Win.FindWindow("Pageant", "Pageant")
+              # If pageant is not running
+              if pageant.to_i == 0
                 @logger.debug { "Disabling use_agent in net-ssh: pageant process not running" }
                 options[:use_agent] = false
               end

data/lib/bolt/util.rb

@@ -85,6 +85,66 @@ module Bolt
         Bolt::Config.user_path && !File.exist?(first_runs_free)
       end
 
+      # If Puppet is loaded, we aleady have the path to the module and should
+      # just get it. This takes the path to a file provided by the user and a
+      # Puppet Parser scope object and tries to find the file, either as an
+      # absolute path or Puppet module syntax lookup. Returns the path to the
+      # file if found, or nil.
+      #
+      def find_file_from_scope(file, scope, fallback = false)
+        # If we got an absolute path, just return that.
+        return file if Pathname.new(file).absolute?
+
+        module_name, file_pattern = Bolt::Util.split_path(file)
+        # Get the absolute path to the module root from the scope
+        mod_path = scope.compiler.environment.module(module_name)&.path
+
+        # Search the module for the file, falling back to new-style paths if enabled.
+        find_file_in_module(mod_path, file_pattern, fallback) if mod_path
+      end
+
+      # This method is used by Bolt to find files when provided a
+      # module-style path without loading Puppet. It takes the absolute path to
+      # the module root and the module-style path minus the module name and
+      # searches subdirectories in the module in order of precedence.
+      #
+      def find_file_in_module(module_path, module_file, fallback = false)
+        # If the first part of the path is 'scripts' or 'files', the path may
+        # be a new-style file location and should fall back to the new path.
+        subdir_or_file = split_path(module_file).first
+        case subdir_or_file
+          # For any subdirs that may indicate the user passed a new-style path,
+          # first look in 'mymod/files/<relative_path>' (old-style) then fall
+          # back to 'mymod/<relative_path>' (new-style) if enabled.
+        when 'scripts', 'files'
+          search_module(module_path, module_file, fallback)
+        else
+          # If the path definitely isn't new-style, only look in the 'files/'
+          # directory.
+          search_module(module_path, module_file)
+        end
+      end
+
+      # This searches a module for files under 'files/' or 'scripts/',
+      # optionally falling back to the new style of file loading. It takes the
+      # absolute path to the module root, the relative path provided by the
+      # user, and whether to fall back to the new-style script loading if the
+      # file isn't found in 'files/'.
+      #
+      private def search_module(module_path, module_file, fallback = false)
+        if File.exist?(File.join(module_path, 'files', module_file))
+          File.join(module_path, 'files', module_file)
+        elsif File.exist?(File.join(module_path, module_file)) && fallback
+          File.join(module_path, module_file)
+        end
+      end
+
+      # Copied directly from puppet/lib/puppet/parser/files.rb
+      #
+      def split_path(path)
+        path.split(File::SEPARATOR, 2)
+      end
+
       # Accepts a path with either 'plans' or 'tasks' in it and determines
       # the name of the module
       def module_name(path)
@@ -343,6 +403,17 @@ module Bolt
         Open3.capture3(env, 'docker', *cmd, { binmode: true })
       end
 
+      # Executes a Podman CLI command. This is useful for running commands as
+      # part of this class without having to go through the `execute`
+      # function and manage pipes.
+      #
+      # @param cmd [String] The podman command and arguments to run
+      #   e.g. 'cp <src> <dest>' for `podman cp <src> <dest>`
+      # @return [String, String, Process::Status] The output of the command: STDOUT, STDERR, Process Status
+      def exec_podman(cmd, env = {})
+        Open3.capture3(env, 'podman', *cmd, { binmode: true })
+      end
+
       # Formats a map of environment variables to be passed to a command that
       # accepts repeated `--env` flags
       #

data/lib/bolt/version.rb

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

data/lib/bolt_server/transport_app.rb

@@ -703,6 +703,9 @@ module BoltServer
           connect_plugin = BoltServer::Plugin::PuppetConnectData.new(body['puppet_connect_data'])
           plugins = Bolt::Plugin.setup(context[:config], context[:pal], load_plugins: false)
           plugins.add_plugin(connect_plugin)
+          %w[aws_inventory azure_inventory gcloud_inventory].each do |plugin_name|
+            plugins.add_module_plugin(plugin_name) if plugins.known_plugin?(plugin_name)
+          end
           inventory = Bolt::Inventory.from_config(context[:config], plugins)
           target_list = inventory.get_targets('all').map do |targ|
             targ.to_h.merge({ 'transport' => targ.transport, 'plugin_hooks' => targ.plugin_hooks })

data/lib/bolt_spec/plans/mock_executor.rb

@@ -17,13 +17,14 @@ module BoltSpec
 
     # Nothing on the executor is 'public'
     class MockExecutor
-      attr_reader :noop, :error_message, :in_parallel, :transports
+      attr_reader :noop, :error_message, :in_parallel, :transports, :future
       attr_accessor :run_as, :transport_features, :execute_any_plan
 
       def initialize(modulepath)
         @noop = false
         @run_as = nil
         @in_parallel = false
+        @future = {}
         @error_message = nil
         @allow_apply = false
         @modulepath = [modulepath].flatten.map { |path| File.absolute_path(path) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -414,6 +414,7 @@ files:
 - bolt-modules/boltlib/lib/puppet/functions/get_target.rb
 - bolt-modules/boltlib/lib/puppet/functions/get_targets.rb
 - bolt-modules/boltlib/lib/puppet/functions/parallelize.rb
+- bolt-modules/boltlib/lib/puppet/functions/puppetdb_command.rb
 - bolt-modules/boltlib/lib/puppet/functions/puppetdb_fact.rb
 - bolt-modules/boltlib/lib/puppet/functions/puppetdb_query.rb
 - bolt-modules/boltlib/lib/puppet/functions/remove_from_group.rb
@@ -449,11 +450,15 @@ files:
 - bolt-modules/prompt/lib/puppet/functions/prompt/menu.rb
 - bolt-modules/system/lib/puppet/functions/system/env.rb
 - exe/bolt
+- guides/guide.txt
 - guides/inventory.txt
+- guides/links.txt
 - guides/logging.txt
 - guides/module.txt
 - guides/modulepath.txt
 - guides/project.txt
+- guides/targets.txt
+- guides/transports.txt
 - lib/bolt.rb
 - lib/bolt/analytics.rb
 - lib/bolt/applicator.rb
@@ -473,6 +478,7 @@ files:
 - lib/bolt/config/transport/lxd.rb
 - lib/bolt/config/transport/options.rb
 - lib/bolt/config/transport/orch.rb
+- lib/bolt/config/transport/podman.rb
 - lib/bolt/config/transport/remote.rb
 - lib/bolt/config/transport/ssh.rb
 - lib/bolt/config/transport/winrm.rb
@@ -564,6 +570,8 @@ files:
 - lib/bolt/transport/lxd/connection.rb
 - lib/bolt/transport/orch.rb
 - lib/bolt/transport/orch/connection.rb
+- lib/bolt/transport/podman.rb
+- lib/bolt/transport/podman/connection.rb
 - lib/bolt/transport/remote.rb
 - lib/bolt/transport/simple.rb
 - lib/bolt/transport/ssh.rb