bolt 1.35.0 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 795f28f4c6cb07e73c21931930b94859b00965416a800746a6e974eade2e637e
-  data.tar.gz: 3d3becef8defffea7e2db0218bac41d9a8215d84ec9617da941378fb7d42809c
+  metadata.gz: bc29b4aca58aa7208e448120f59687cb5fbdd0cbab78af55861b629420a9fb9e
+  data.tar.gz: 46ec4cca8088b69d9196f3c251084bdeadaee9b676aa4c33617fd0e40a711d20
 SHA512:
-  metadata.gz: 80cd0fe982cf6097316e34703627e4da6aaadb1bd58070c154d96b550d8d7c25528842128771f7600a4cb68fdf7f400987dd687d1a26f3cabea32695ec4b24ec
-  data.tar.gz: 8e2ec2983b1d6d78d17170f7090a4628be18f6e970332ee627c0f0c474d1a2dd7a6ac8575efec374cd77afc65ce3399b5c51b82791e3ed98174a697c718ef93b
+  metadata.gz: 0a0fbaff3412cc6cc7b92922fae45daf150b950d9f60a2eed1d8a97d32ffd404d7c7577167efe90fecf9425444e4acca5794ad8a49ca6248f0a91b6cb6598dec
+  data.tar.gz: da32512009bcbe140b70374ea331a0edbe95696df347311b0b0de07f8740818088c9c2fbfc136572c20c9008c953f205c5e855e048141c9e0a933ce1c77f6d09

data/Puppetfile

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+forge "http://forge.puppetlabs.com"
+
+moduledir File.join(File.dirname(__FILE__), 'modules')
+
+# Core modules used by 'apply'
+mod 'puppetlabs-service', '1.1.0'
+mod 'puppetlabs-facts', '0.6.0'
+mod 'puppetlabs-puppet_agent', '2.2.1'
+
+# Core types and providers for Puppet 6
+mod 'puppetlabs-augeas_core', '1.0.5'
+mod 'puppetlabs-host_core', '1.0.3'
+mod 'puppetlabs-scheduled_task', '2.0.0'
+mod 'puppetlabs-sshkeys_core', '1.0.3'
+mod 'puppetlabs-zfs_core', '1.0.4'
+mod 'puppetlabs-cron_core', '1.0.3'
+mod 'puppetlabs-mount_core', '1.0.4'
+mod 'puppetlabs-selinux_core', '1.0.4'
+mod 'puppetlabs-yumrepo_core', '1.0.4'
+mod 'puppetlabs-zone_core', '1.0.3'
+
+# Useful additional modules
+mod 'puppetlabs-package', '0.7.0'
+mod 'puppetlabs-puppet_conf', '0.4.0'
+mod 'puppetlabs-python_task_helper', '0.3.0'
+mod 'puppetlabs-reboot', '2.2.0'
+mod 'puppetlabs-ruby_task_helper', '0.4.0'
+
+# Plugin modules
+mod 'puppetlabs-azure_inventory', '0.2.0'
+mod 'puppetlabs-terraform', '0.2.0'
+mod 'puppetlabs-vault', '0.2.2'
+mod 'puppetlabs-aws_inventory', '0.2.0'
+
+# If we don't list these modules explicitly, r10k will purge them
+mod 'canary', local: true
+mod 'aggregate', local: true
+mod 'puppetdb_fact', local: true

data/lib/bolt/applicator.rb

@@ -132,7 +132,9 @@ module Bolt
     def validate_hiera_config(hiera_config)
       if File.exist?(File.path(hiera_config))
         data = File.open(File.path(hiera_config), "r:UTF-8") { |f| YAML.safe_load(f.read, [Symbol]) }
-        unless data['version'] == 5
+        if data.nil?
+          return nil
+        elsif data['version'] != 5
           raise Bolt::ParseError, "Hiera v5 is required, found v#{data['version'] || 3} in #{hiera_config}"
         end
         hiera_config

data/lib/bolt/bolt_option_parser.rb

@@ -29,7 +29,7 @@ module Bolt
         { flags: ACTION_OPTS + %w[tmpdir],
           banner: FILE_HELP }
       when 'inventory'
-        { flags: OPTIONS[:inventory] + OPTIONS[:global] + %w[format inventoryfile boltdir configfile],
+        { flags: OPTIONS[:inventory] + OPTIONS[:global] + %w[format inventoryfile boltdir configfile detail],
           banner: INVENTORY_HELP }
       when 'group'
         { flags: OPTIONS[:global] + %w[format inventoryfile boltdir configfile],
@@ -49,6 +49,15 @@ module Bolt
           { flags: ACTION_OPTS + %w[params compile-concurrency tmpdir],
             banner: PLAN_HELP }
         end
+      when 'project'
+        case action
+        when 'init'
+          { flags: OPTIONS[:global],
+            banner: PROJECT_INIT_HELP }
+        else
+          { flags: OPTIONS[:global],
+            banner: PROJECT_HELP }
+        end
       when 'puppetfile'
         case action
         when 'install'
@@ -121,6 +130,7 @@ module Bolt
         bolt secret decrypt <encrypted>  Decrypt a value
         bolt inventory show              Show the list of targets an action would run on
         bolt group show                  Show the list of groups in the inventory
+        bolt project init                Create a new Bolt project
 
       Run `bolt <subcommand> --help` to view specific examples.
 
@@ -310,13 +320,32 @@ module Bolt
       Available options are:
     GROUP_HELP
 
+    PROJECT_HELP = <<~PROJECT_HELP
+      Usage: bolt project <action>
+
+      Available actions are:
+        init                     Create a new Bolt project
+
+      Available options are:
+    PROJECT_HELP
+
+    PROJECT_INIT_HELP = <<~PROJECT_INIT_HELP
+      Usage: bolt project init [directory]
+
+      Create a new Bolt project.
+      Specify a directory to create the Bolt project in. Defaults to the current working directory.
+
+      Available options are:
+    PROJECT_INIT_HELP
+
     def initialize(options)
       super()
 
       @options = options
 
       define('-n', '--nodes NODES',
-             'Alias for --targets') do |nodes|
+             'Alias for --targets',
+             'Deprecated in favor of --targets') do |nodes|
         @options [:nodes] ||= []
         @options[:nodes] << get_arg_input(nodes)
       end
@@ -357,20 +386,23 @@ module Bolt
              "Puppet manifest code to apply to the targets") do |code|
         @options[:code] = code
       end
+      define('--detail', 'Show resolved configuration for the targets') do |detail|
+        @options[:detail] = detail
+      end
 
       separator "\nAuthentication:"
       define('-u', '--user USER', 'User to authenticate as') do |user|
         @options[:user] = user
       end
       define('-p', '--password [PASSWORD]',
-             'Password to authenticate with. Omit the value to prompt for the password.') do |password|
-        if password.nil?
-          STDOUT.print "Please enter your password: "
-          @options[:password] = STDIN.noecho(&:gets).chomp
-          STDOUT.puts
-        else
-          @options[:password] = password
+             'Password to authenticate with') do |password|
+        # TODO: Remove deprecation message
+        unless password
+          msg = "Optional parameter for --password is deprecated and no longer prompts for password. " \
+                "Use the prompt plugin instead to prompt for passwords."
+          raise Bolt::CLIError, msg
         end
+        @options[:password] = password
       end
       define('--private-key KEY', 'Private ssh key to authenticate with') do |key|
         @options[:'private-key'] = key
@@ -390,14 +422,14 @@ module Bolt
         @options[:'run-as'] = user
       end
       define('--sudo-password [PASSWORD]',
-             'Password for privilege escalation. Omit the value to prompt for the password.') do |password|
-        if password.nil?
-          STDOUT.print "Please enter your privilege escalation password: "
-          @options[:'sudo-password'] = STDIN.noecho(&:gets).chomp
-          STDOUT.puts
-        else
-          @options[:'sudo-password'] = password
+             'Password for privilege escalation') do |password|
+        # TODO: Remove deprecation message
+        unless password
+          msg = "Optional parameter for --sudo-password is deprecated and no longer prompts for password. " \
+                "Use the prompt plugin instead to prompt for passwords."
+          raise Bolt::CLIError, msg
         end
+        @options[:'sudo-password'] = password
       end
 
       separator "\nRun context:"
@@ -422,7 +454,8 @@ module Bolt
         @options[:boltdir] = path
       end
       define('--configfile FILEPATH',
-             'Specify where to load config from (default: ~/.puppetlabs/bolt/bolt.yaml)') do |path|
+             'Specify where to load config from (default: ~/.puppetlabs/bolt/bolt.yaml). ' \
+             'Directory containing bolt.yaml will be used as the Boltdir.') do |path|
         @options[:configfile] = path
       end
       define('-i', '--inventoryfile FILEPATH',

data/lib/bolt/cli.rb

@@ -37,6 +37,7 @@ module Bolt
                  'secret' => %w[encrypt decrypt createkeys],
                  'inventory' => %w[show],
                  'group' => %w[show],
+                 'project' => %w[init],
                  'apply' => %w[] }.freeze
 
     attr_reader :config, :options
@@ -134,6 +135,7 @@ module Bolt
       # options[:targets] will contain a resolved set of Target objects
       unless options[:subcommand] == 'puppetfile' ||
              options[:subcommand] == 'secret' ||
+             options[:subcommand] == 'project' ||
              options[:action] == 'show' ||
              options[:action] == 'convert'
 
@@ -145,6 +147,13 @@ module Bolt
         options[:verbose] = options[:subcommand] != 'plan'
       end
 
+      # TODO: Remove deprecation warning
+      if options[:nodes]
+        @logger.warn("Deprecation Warning: The --nodes command line option has been " \
+                     "deprecated in favor of --targets.")
+      end
+
+      warn_inventory_overrides_cli(options)
       options
     rescue Bolt::Error => e
       outputter.fatal_error(e)
@@ -244,7 +253,7 @@ module Bolt
 
     def puppetdb_client
       return @puppetdb_client if @puppetdb_client
-      puppetdb_config = Bolt::PuppetDB::Config.load_config(nil, config.puppetdb)
+      puppetdb_config = Bolt::PuppetDB::Config.load_config(nil, config.puppetdb, config.boltdir.path)
       @puppetdb_client = Bolt::PuppetDB::Client.new(puppetdb_config)
     end
 
@@ -256,6 +265,35 @@ module Bolt
       puppetdb_client.query_certnames(query)
     end
 
+    def warn_inventory_overrides_cli(opts)
+      inventory_source = if ENV[Bolt::Inventory::ENVIRONMENT_VAR]
+                           Bolt::Inventory::ENVIRONMENT_VAR
+                         elsif @config.inventoryfile && Bolt::Util.file_stat(@config.inventoryfile)
+                           @config.inventoryfile
+                         elsif (inventory_file = @config.default_inventoryfile.find do |file|
+                                  begin
+                                    Bolt::Util.file_stat(file)
+                                  rescue Errno::ENOENT
+                                    false
+                                  end
+                                end
+                               )
+                           inventory_file
+                         end
+
+      inventory_cli_opts = %i[authentication escalation transports].each_with_object([]) do |key, acc|
+        acc.concat(Bolt::BoltOptionParser::OPTIONS[key])
+      end
+
+      inventory_cli_opts.concat(%w[no-host-key-check no-ssl no-ssl-verify no-tty])
+
+      conflicting_options = Set.new(opts.keys.map(&:to_s)).intersection(inventory_cli_opts)
+
+      if inventory_source && conflicting_options.any?
+        @logger.warn("CLI arguments #{conflicting_options.to_a} may be overridden by Inventory: #{inventory_source}")
+      end
+    end
+
     def execute(options)
       message = nil
 
@@ -307,7 +345,11 @@ module Bolt
             list_plans
           end
         elsif options[:subcommand] == 'inventory'
-          list_targets
+          if options[:detail]
+            show_targets
+          else
+            list_targets
+          end
         elsif options[:subcommand] == 'group'
           list_groups
         end
@@ -324,6 +366,8 @@ module Bolt
       end
 
       case options[:subcommand]
+      when 'project'
+        code = initialize_project
       when 'plan'
         code = run_plan(options[:object], options[:task_options], options[:target_args], options)
       when 'puppetfile'
@@ -413,7 +457,12 @@ module Bolt
 
     def list_targets
       update_targets(options)
-      outputter.print_targets(options)
+      outputter.print_targets(options[:targets])
+    end
+
+    def show_targets
+      update_targets(options)
+      outputter.print_target_info(options[:targets])
     end
 
     def list_groups
@@ -495,6 +544,21 @@ module Bolt
       0
     end
 
+    def initialize_project
+      path = File.expand_path(options[:object] || Dir.pwd)
+      FileUtils.mkdir_p(path)
+      ok = FileUtils.touch(File.join(path, 'bolt.yaml'))
+
+      result = if ok
+                 "Successfully created Bolt project directory at #{path}"
+               else
+                 "Could not create Bolt project directory at #{path}"
+               end
+      outputter.print_message result
+
+      ok ? 0 : 1
+    end
+
     def install_puppetfile(config, puppetfile, modulepath)
       require 'r10k/cli'
       require 'bolt/r10k_log_proxy'

data/lib/bolt/config.rb

@@ -110,7 +110,11 @@ module Bolt
     def normalize_log(target)
       return target if target == 'console'
       target = target[5..-1] if target.start_with?('file:')
-      'file:' + File.expand_path(target)
+      if @future
+        'file:' + File.expand_path(target, @boltdir.path)
+      else
+        'file:' + File.expand_path(target)
+      end
     end
 
     def update_logs(logs)
@@ -132,6 +136,8 @@ module Bolt
     end
 
     def update_from_file(data)
+      @future = data['future'] == true
+
       if data['log'].is_a?(Hash)
         update_logs(data['log'])
       end
@@ -164,8 +170,6 @@ module Bolt
       @plugins = data['plugins'] if data.key?('plugins')
       @plugin_hooks.merge!(data['plugin_hooks']) if data.key?('plugin_hooks')
 
-      @future = data['future'] == true
-
       %w[concurrency format puppetdb color transport].each do |key|
         send("#{key}=", data[key]) if data.key?(key)
       end
@@ -173,6 +177,13 @@ module Bolt
       TRANSPORTS.each do |key, impl|
         if data[key.to_s]
           selected = impl.filter_options(data[key.to_s])
+          if @future
+            to_expand = %w[private-key cacert token-file] & selected.keys
+            to_expand.each do |opt|
+              selected[opt] = File.expand_path(selected[opt], @boltdir.path) if opt.is_a?(String)
+            end
+          end
+
           @transports[key] = Bolt::Util.deep_merge(@transports[key], selected)
         end
         if @transports[key]['interpreters']

data/lib/bolt/inventory.rb

@@ -47,6 +47,7 @@ module Bolt
       if ENV.include?(ENVIRONMENT_VAR)
         begin
           data = YAML.safe_load(ENV[ENVIRONMENT_VAR])
+          raise Bolt::ParseError, "Could not parse inventory from $#{ENVIRONMENT_VAR}" unless data.is_a?(Hash)
         rescue Psych::Exception
           raise Bolt::ParseError, "Could not parse inventory from $#{ENVIRONMENT_VAR}"
         end
@@ -67,7 +68,7 @@ module Bolt
       when 2
         Bolt::Inventory::Inventory2.new(data, config, plugins: plugins)
       else
-        raise ValidationError, "Unsupported version #{version} specified in inventory"
+        raise ValidationError.new("Unsupported version #{version} specified in inventory", nil)
       end
     end
 
@@ -172,6 +173,14 @@ module Bolt
       @target_features[target.name] || Set.new
     end
 
+    def target_alias(target)
+      @groups.node_aliases.each_with_object([]) do |(alia, name), acc|
+        if target.name == name
+          acc << alia
+        end
+      end.uniq
+    end
+
     def data_hash
       {
         data: @data,

data/lib/bolt/inventory/group2.rb

@@ -9,7 +9,6 @@ module Bolt
     class Group2
       attr_accessor :name, :groups
 
-      # THESE are duplicates with the old groups for now.
       # Regex used to validate group names and target aliases.
       NAME_REGEX = /\A[a-z0-9_][a-z0-9_-]*\Z/.freeze
 
@@ -41,8 +40,7 @@ module Bolt
 
         @unresolved_targets = {}
         @resolved_targets = {}
-        @targets = Set.new
-        # @target_objects = {}
+
         @aliases = {}
         @string_targets = []
 
@@ -57,7 +55,7 @@ module Bolt
           elsif target.is_a?(Hash)
             add_target_definition(target)
           else
-            raise ValidationError.new("Node entry must be a String or Hash, not #{target.class}", @name)
+            raise ValidationError.new("Target entry must be a String or Hash, not #{target.class}", @name)
           end
         end
 
@@ -150,6 +148,7 @@ module Bolt
           resolved_data = resolve_data_keys(target, target_name).merge(
             'name' => target['name'],
             'uri' => target['uri'],
+            'alias' => target['alias'],
             # groups come from group_data
             'groups' => []
           )
@@ -159,12 +158,16 @@ module Bolt
         end
       end
 
+      def all_target_names
+        @unresolved_targets.keys + @resolved_targets.keys
+      end
+
       def add_target_definition(target)
         # This check ensures target lookup plugins do not returns bare strings.
-        # Remove it if we decide to allows task plugins to return string node
+        # Remove it if we decide to allows task plugins to return string Target
         # names.
         unless target.is_a?(Hash)
-          raise ValidationError.new("Node entry must be a Hash, not #{target.class}", @name)
+          raise ValidationError.new("Target entry must be a Hash, not #{target.class}", @name)
         end
 
         target['name'] = resolve_references(target['name']) if target.key?('name')
@@ -201,14 +204,7 @@ module Bolt
             raise ValidationError.new(msg, @name)
           end
 
-          aliases.each do |alia|
-            raise ValidationError.new("Invalid alias #{alia}", @name) unless alia =~ NAME_REGEX
-
-            if (found = @aliases[alia])
-              raise ValidationError.new(alias_conflict(alia, found, t_name), @name)
-            end
-            @aliases[alia] = t_name
-          end
+          insert_alia(t_name, aliases)
         end
 
         @unresolved_targets[t_name] = target
@@ -218,6 +214,17 @@ module Bolt
         @resolved_targets[target.name] = { 'name' => target.name }
       end
 
+      def insert_alia(target_name, aliases)
+        aliases.each do |alia|
+          raise ValidationError.new("Invalid alias #{alia}", @name) unless alia =~ NAME_REGEX
+
+          if (found = @aliases[alia])
+            raise ValidationError.new(alias_conflict(alia, found, target_name), @name)
+          end
+          @aliases[alia] = target_name
+        end
+      end
+
       def data_merge(data1, data2)
         if data2.nil? || data1.nil?
           return data2 || data1
@@ -227,6 +234,7 @@ module Bolt
           'config' => Bolt::Util.deep_merge(data1['config'], data2['config']),
           'name' => data1['name'] || data2['name'],
           'uri' => data1['uri'] || data2['uri'],
+          'alias' => data1['alias'] || data2['alias'],
           # Shallow merge instead of deep merge so that vars with a hash value
           # are assigned a new hash, rather than merging the existing value
           # with the value meant to replace it
@@ -277,7 +285,7 @@ module Bolt
       end
 
       private def alias_target_conflict(name)
-        "Node name #{name} conflicts with alias of the same name"
+        "Target name #{name} conflicts with alias of the same name"
       end
 
       def validate_group_input(input)

data/lib/bolt/inventory/inventory2.rb

@@ -176,10 +176,29 @@ module Bolt
         unless existing_target
           add_to_group([new_target], 'all')
         end
+        # Insert target alias into groups that contain the target
+        if (aliases = new_target.target_alias)
+          aliases = [aliases] if aliases.is_a?(String)
+          unless aliases.is_a?(Array)
+            msg = "Alias entry on #{t_name} must be a String or Array, not #{aliases.class}"
+            raise ValidationError.new(msg, @name)
+          end
+
+          insert_alias_into_group(@groups, new_target.name, aliases)
+        end
 
         new_target
       end
 
+      def insert_alias_into_group(group, target_name, aliases)
+        if group.all_target_names.include?(target_name)
+          group.insert_alia(target_name, aliases)
+        end
+        group.groups.each do |grp|
+          insert_alias_into_group(grp, target_name, aliases)
+        end
+      end
+
       def add_to_group(targets, desired_group)
         if group_names.include?(desired_group)
           targets.each do |target|

data/lib/bolt/inventory/target.rb

@@ -4,7 +4,7 @@ module Bolt
   class Inventory
     # This class represents the active state of a target within the inventory.
     class Target
-      attr_reader :name, :uri, :safe_name
+      attr_reader :name, :uri, :safe_name, :target_alias
 
       def initialize(target_data, inventory)
         unless target_data['name'] || target_data['uri']
@@ -34,7 +34,9 @@ module Bolt
         @features = target_data['features'] || Set.new
         @options = target_data['options'] || {}
         @plugin_hooks = target_data['plugin_hooks'] || {}
-        @target_alias = target_data['target_alias'] || []
+        # When alias is specified in a plan, the key will be `target_alias`, when
+        # alias is specified in inventory the key will be `alias`.
+        @target_alias = target_data['target_alias'] || target_data['alias'] || []
 
         @inventory = inventory
 
@@ -42,7 +44,6 @@ module Bolt
       end
 
       def vars
-        # XXX Return vars from the cache
         group_cache['vars'].merge(@vars)
       end
 
@@ -55,7 +56,6 @@ module Bolt
       # rubocop:enable Naming/AccessorMethodName
 
       def facts
-        # XXX Return facts from the cache
         Bolt::Util.deep_merge(group_cache['facts'], @facts)
       end
 

data/lib/bolt/outputter/human.rb

@@ -135,7 +135,7 @@ module Bolt
         target_str = if targets.length > 5
                        "#{targets.count} targets"
                      else
-                       targets.map(&:uri).join(', ')
+                       targets.map(&:safe_name).join(', ')
                      end
         @stream.puts(colorize(:green, "Starting: #{description} on #{target_str}"))
       end
@@ -219,7 +219,7 @@ module Bolt
         # Building lots of strings...
         pretty_params = +""
         task_info = +""
-        usage = +"bolt task run --nodes <node-name> #{task['name']}"
+        usage = +"bolt task run --targets <node-name> #{task['name']}"
 
         task['metadata']['parameters']&.each do |k, v|
           pretty_params << "- #{k}: #{v['type'] || 'Any'}\n"
@@ -311,10 +311,17 @@ module Bolt
         end
       end
 
-      def print_targets(options)
-        targets = options[:targets].map(&:name)
+      def print_targets(targets)
+        count = "#{targets.count} target#{'s' unless targets.count == 1}"
+        @stream.puts targets.map(&:name).join("\n")
+        @stream.puts colorize(:green, count)
+      end
+
+      def print_target_info(targets)
+        @stream.puts ::JSON.pretty_generate(
+          "targets": targets.map(&:detail)
+        )
         count = "#{targets.count} target#{'s' unless targets.count == 1}"
-        @stream.puts targets.join("\n")
         @stream.puts colorize(:green, count)
       end
 

data/lib/bolt/outputter/json.rb

@@ -89,11 +89,18 @@ module Bolt
                        "moduledir": moduledir }.to_json)
       end
 
-      def print_targets(options)
-        targets = options[:targets].map(&:name)
-        count = targets.count
-        @stream.puts({ "targets": targets,
-                       "count": count }.to_json)
+      def print_targets(targets)
+        @stream.puts ::JSON.pretty_generate(
+          "targets": targets.map(&:name),
+          "count": targets.count
+        )
+      end
+
+      def print_target_info(targets)
+        @stream.puts ::JSON.pretty_generate(
+          "targets": targets.map(&:detail),
+          "count": targets.count
+        )
       end
 
       def print_groups(groups)

data/lib/bolt/outputter/logger.rb

@@ -27,7 +27,7 @@ module Bolt
         target_str = if targets.length > 5
                        "#{targets.count} targets"
                      else
-                       targets.map(&:uri).join(', ')
+                       targets.map(&:safe_name).join(', ')
                      end
         @logger.info("Starting: #{description} on #{target_str}")
       end

data/lib/bolt/plugin/prompt.rb

@@ -19,9 +19,12 @@ module Bolt
       end
 
       def resolve_reference(opts)
-        STDOUT.print "#{opts['message']}:"
+        # rubocop:disable Style/GlobalVars
+        $future ? STDERR.print("#{opts['message']}:") : STDOUT.print("#{opts['message']}:")
         value = STDIN.noecho(&:gets).chomp
-        STDOUT.puts
+        $future ? STDERR.puts : STDOUT.puts
+        # rubocop:enable Style/GlobalVars
+
         value
       end
     end

data/lib/bolt/puppetdb/config.rb

@@ -19,7 +19,7 @@ module Bolt
 
       end
 
-      def self.load_config(filename, options)
+      def self.load_config(filename, options, boltdir_path = nil)
         config = {}
         global_path = Bolt::Util.windows? ? DEFAULT_CONFIG[:win_global] : DEFAULT_CONFIG[:global]
         if filename
@@ -43,11 +43,12 @@ module Bolt
         end
 
         config = config.fetch('puppetdb', {})
-        new(config.merge(options))
+        new(config.merge(options), boltdir_path)
       end
 
-      def initialize(settings)
+      def initialize(settings, boltdir_path = nil)
         @settings = settings
+        @boltdir_path = boltdir_path
         expand_paths
       end
 
@@ -66,7 +67,14 @@ module Bolt
 
       def expand_paths
         %w[cacert cert key token].each do |file|
-          @settings[file] = File.expand_path(@settings[file]) if @settings[file]
+          next unless @settings[file]
+          # rubocop:disable Style/GlobalVars
+          @settings[file] = if $future && @boltdir_path
+                              File.expand_path(@settings[file], @boltdir_path)
+                            else
+                              File.expand_path(@settings[file])
+                            end
+          # rubocop:enable Style/GlobalVars
         end
       end
 

data/lib/bolt/target.rb

@@ -14,6 +14,7 @@ module Bolt
       new(target.name, inventory)
     end
 
+    # TODO: Disallow any positional argument other than URI.
     # Target.new from a plan with just a uri. Puppet requires the arguments to
     # this method to match (by name) the attributes defined on the datatype.
     # rubocop:disable Lint/UnusedMethodArgument
@@ -27,12 +28,12 @@ module Bolt
                                 plugin_hooks = nil)
       from_asserted_hash('uri' => uri)
     end
+    # rubocop:enable Lint/UnusedMethodArgument
 
     def initialize(name, inventory = nil)
       @name = name
       @inventory = inventory
     end
-    # rubocop:enable Lint/UnusedMethodArgument
 
     # features returns an array to be compatible with plans
     def features
@@ -80,6 +81,19 @@ module Bolt
       )
     end
 
+    def detail
+      {
+        'name' => name,
+        'uri' => uri,
+        'alias' => target_alias,
+        'config' => Bolt::Util.deep_merge(config, 'transport' => transport, transport => options),
+        'vars' => vars,
+        'features' => features,
+        'facts' => facts,
+        'plugin_hooks' => plugin_hooks
+      }
+    end
+
     def inventory_target
       @inventory.targets[@name]
     end
@@ -226,6 +240,18 @@ module Bolt
       end
     end
 
+    def vars
+      @inventory.vars(self)
+    end
+
+    def facts
+      @inventory.facts(self)
+    end
+
+    def target_alias
+      @inventory.target_alias(self)
+    end
+
     # TODO: WHAT does equality mean here?
     # should we just compare names? is there something else that is meaninful?
     def eql?(other)
@@ -258,6 +284,21 @@ module Bolt
       )
     end
 
+    def detail
+      {
+        'name' => name,
+        'alias' => target_alias,
+        'config' => {
+          'transport' => transport,
+          transport => options
+        },
+        'vars' => vars,
+        'facts' => facts,
+        'features' => features.to_a,
+        'plugin_hooks' => plugin_hooks
+      }
+    end
+
     def host
       @uri_obj&.hostname || @host
     end

data/lib/bolt/version.rb

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

data/lib/bolt_spec/plans.rb

@@ -4,6 +4,7 @@ require 'bolt_spec/plans/mock_executor'
 require 'bolt/config'
 require 'bolt/inventory'
 require 'bolt/pal'
+require 'bolt/plugin'
 
 # These helpers are intended to be used for plan unit testing without calling
 # out to target nodes. It accomplishes this by replacing bolt's executor with a
@@ -158,6 +159,13 @@ module BoltSpec
       raise "RSpec.configuration.module_path not defined set up rspec puppet or define modulepath for this test"
     end
 
+    def plugins
+      @plugins ||= Bolt::Plugin.setup(config,
+                                      pal,
+                                      puppetdb_client,
+                                      Bolt::Analytics::NoopClient.new)
+    end
+
     # Override in your tests
     def config
       @config ||= begin
@@ -168,8 +176,12 @@ module BoltSpec
     end
 
     # Override in your tests
+    def inventory_data
+      {}
+    end
+
     def inventory
-      @inventory ||= Bolt::Inventory.new({})
+      @inventory ||= Bolt::Inventory.create_version(inventory_data, config, plugins)
     end
 
     # Provided as a class so expectations can be placed on it.
@@ -179,6 +191,10 @@ module BoltSpec
       @puppetdb_client ||= MockPuppetDBClient.new
     end
 
+    def pal
+      @pal ||= Bolt::PAL.new(config.modulepath, config.hiera_config, config.boltdir.resource_types)
+    end
+
     def run_plan(name, params)
       pal = Bolt::PAL.new(config.modulepath, config.hiera_config, config.boltdir.resource_types)
       result = pal.run_plan(name, params, executor, inventory, puppetdb_client)

data/lib/bolt_spec/plans/action_stubs/task_stub.rb

@@ -23,7 +23,10 @@ module BoltSpec
         @calls += 1
         if @return_block
           # Merge arguments and options into params to match puppet function signature.
-          check_resultset(@return_block.call(targets: targets, task: task, params: arguments.merge(options)), task)
+          params = options.map { |k, v| ["_#{k}", v] }.to_h
+          params = params.merge(arguments)
+
+          check_resultset(@return_block.call(targets: targets, task: task, params: params), task)
         else
           Bolt::ResultSet.new(targets.map { |target| @data[target.name] || default_for(target) })
         end

data/lib/bolt_spec/plans/mock_executor.rb

@@ -17,7 +17,7 @@ module BoltSpec
     # Nothing on the executor is 'public'
     class MockExecutor
       attr_reader :noop, :error_message
-      attr_accessor :run_as
+      attr_accessor :run_as, :transport_features
 
       def initialize(modulepath)
         @noop = false
@@ -27,6 +27,7 @@ module BoltSpec
         @modulepath = [modulepath].flatten.map { |path| File.absolute_path(path) }
         MOCKED_ACTIONS.each { |action| instance_variable_set(:"@#{action}_doubles", {}) }
         @stub_out_message = nil
+        @transport_features = ['puppet-agent']
       end
 
       def module_file_id(file)
@@ -168,12 +169,12 @@ module BoltSpec
 
       # Mocked for apply_prep
       def transport(_protocol)
-        # Always return a transport that includes the puppet-agent feature so version/install are skipped.
         Class.new do
-          def provided_features
-            ['puppet-agent']
+          attr_reader :provided_features
+          def initialize(features)
+            @provided_features = features
           end
-        end.new
+        end.new(transport_features)
       end
       # End apply_prep mocking
     end

data/lib/bolt_spec/run.rb

@@ -5,6 +5,7 @@ require 'bolt/config'
 require 'bolt/executor'
 require 'bolt/inventory'
 require 'bolt/pal'
+require 'bolt/plugin'
 require 'bolt/puppetdb'
 require 'bolt/util'
 
@@ -130,20 +131,30 @@ module BoltSpec
       # still be loaded
       def self.with_runner(config_data, inventory_data)
         Dir.mktmpdir do |boltdir_path|
-          config = Bolt::Config.new(Bolt::Boltdir.new(boltdir_path), config_data || {})
-          inventory = Bolt::Inventory.new(inventory_data || {}, config)
-          yield new(config, inventory)
+          runner = new(config_data, inventory_data, boltdir_path)
+          yield runner
         end
       end
 
-      attr_reader :config, :inventory
-
-      def initialize(config, inventory)
-        @config = config
-        @inventory = inventory
+      def initialize(config_data, inventory_data, boltdir_path)
+        @config_data = config_data || {}
+        @inventory_data = inventory_data || {}
+        @boltdir_path = boltdir_path
         @analytics = Bolt::Analytics::NoopClient.new
       end
 
+      def config
+        @config ||= Bolt::Config.new(Bolt::Boltdir.new(@boltdir_path), @config_data)
+      end
+
+      def inventory
+        @inventory ||= Bolt::Inventory.create_version(@inventory_data, config, plugins)
+      end
+
+      def plugins
+        @plugins ||= Bolt::Plugin.setup(config, pal, puppetdb_client, @analytics)
+      end
+
       def puppetdb_client
         @puppetdb_client ||= begin
                                puppetdb_config = Bolt::PuppetDB::Config.load_config(nil, config.puppetdb)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.35.0
+  version: 1.36.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -319,6 +319,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Puppetfile
 - bolt-modules/boltlib/lib/puppet/datatypes/applyresult.rb
 - bolt-modules/boltlib/lib/puppet/datatypes/result.rb
 - bolt-modules/boltlib/lib/puppet/datatypes/resultset.rb