bolt 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5ccf0b9b2f554bd10a8f4b25eedf4049c6b2820925d614be61a20b29ce64f5e
-  data.tar.gz: 814f77cef6785b3c5978c5b1336f0e8eb6cced7e3e1eb8917c2cbc7c96955deb
+  metadata.gz: b5cea3288b0599937b773308e2f7286661c8e325ee2f04cb69b7e5521423d487
+  data.tar.gz: c1bffcef93f5167db8ecc2a21ce934a74b59ea40280a91b1bbcfde9b74d1b6dc
 SHA512:
-  metadata.gz: '058a15c710a702ea63e4f989b0f96efa3c2c54a074650e0609dd1157f4fe6818fcaa8f2aaadbf145dbf588411cecf0d686e07821d9ad66994cab59de7ec5a9b5'
-  data.tar.gz: 5292df40ecd9c3db055603aa279db60b2b80ce8ac416756d0c3b5e4fef7f072b7b766e78dd236f2630f00c71d3b27fc59b97681546eb680057e34df18da7dd36
+  metadata.gz: 07a86d3b9ab1a6d5d736a00e1384a0955164db3a978f5a3532d9422396116df5c024254c10afeed4af7a9253acd0bc64a78b640531716e5fe917f54b2deca3da
+  data.tar.gz: e30621636ccc9a6da616b7b9802a7aee40c99146e6983c89358332f091c004c3430a963beb2ebe3b1bee5685b2fa5e7be578a907be80971fa07fea0362b3ba7b

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

@@ -25,7 +25,7 @@ Puppet::Functions.create_function(:add_facts) do
 
     inventory = Puppet.lookup(:bolt_inventory)
     executor = Puppet.lookup(:bolt_executor)
-    executor.report_function_call('add_facts')
+    executor.report_function_call(self.class.name)
 
     inventory.add_facts(target, facts)
   end

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

@@ -29,7 +29,7 @@ Puppet::Functions.create_function(:add_to_group) do
 
     inventory = Puppet.lookup(:bolt_inventory)
     executor = Puppet.lookup(:bolt_executor)
-    executor.report_function_call('add_to_group')
+    executor.report_function_call(self.class.name)
 
     inventory.add_to_group(inventory.get_targets(targets), group)
   end

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

@@ -50,7 +50,7 @@ Puppet::Functions.create_function(:apply_prep) do
     executor = Puppet.lookup(:bolt_executor)
     inventory = Puppet.lookup(:bolt_inventory)
 
-    executor.report_function_call('apply_prep')
+    executor.report_function_call(self.class.name)
 
     targets = inventory.get_targets(target_spec)
 

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

@@ -17,7 +17,7 @@ Puppet::Functions.create_function(:facts) do
     inventory = Puppet.lookup(:bolt_inventory)
     # Bolt executor not expected when invoked from apply block
     executor = Puppet.lookup(:bolt_executor) { nil }
-    executor&.report_function_call('facts')
+    executor&.report_function_call(self.class.name)
 
     inventory.facts(target)
   end

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

@@ -40,7 +40,7 @@ Puppet::Functions.create_function(:fail_plan) do
     end
 
     executor = Puppet.lookup(:bolt_executor)
-    executor.report_function_call('fail_plan')
+    executor.report_function_call(self.class.name)
 
     raise Bolt::PlanFailure.new(msg, kind || 'bolt/plan-failure', details, issue_code)
   end

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

@@ -50,7 +50,7 @@ Puppet::Functions.create_function(:get_resources) do
       end
     end
 
-    executor.report_function_call('get_resources')
+    executor.report_function_call(self.class.name)
 
     targets = inventory.get_targets(target_spec)
 

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

@@ -25,7 +25,7 @@ Puppet::Functions.create_function(:get_targets) do
     inventory = Puppet.lookup(:bolt_inventory)
     # Bolt executor not expected when invoked from apply block
     executor = Puppet.lookup(:bolt_executor) { nil }
-    executor&.report_function_call('get_targets')
+    executor&.report_function_call(self.class.name)
 
     inventory.get_targets(names)
   end

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

@@ -20,7 +20,7 @@ Puppet::Functions.create_function(:puppetdb_fact) do
     puppetdb_client = Puppet.lookup(:bolt_pdb_client)
     # Bolt executor not expected when invoked from apply block
     executor = Puppet.lookup(:bolt_executor) { nil }
-    executor&.report_function_call('puppetdb_fact')
+    executor&.report_function_call(self.class.name)
 
     puppetdb_client.facts_for_node(certnames)
   end

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

@@ -22,7 +22,7 @@ Puppet::Functions.create_function(:puppetdb_query) do
     puppetdb_client = Puppet.lookup(:bolt_pdb_client)
     # Bolt executor not expected when invoked from apply block
     executor = Puppet.lookup(:bolt_executor) { nil }
-    executor&.report_function_call('puppetdb_query')
+    executor&.report_function_call(self.class.name)
 
     puppetdb_client.make_query(query)
   end

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

@@ -52,7 +52,7 @@ Puppet::Functions.create_function(:run_command) do
     executor = Puppet.lookup(:bolt_executor)
     inventory = Puppet.lookup(:bolt_inventory)
 
-    executor.report_function_call('run_command')
+    executor.report_function_call(self.class.name)
 
     # Ensure that given targets are all Target instances
     targets = inventory.get_targets(targets)

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

@@ -29,7 +29,7 @@ Puppet::Functions.create_function(:run_plan, Puppet::Functions::InternalFunction
     # Bolt calls this function internally to trigger plans from the CLI. We
     # don't want to count those invocations.
     unless named_args['_bolt_api_call']
-      executor.report_function_call('run_plan')
+      executor.report_function_call(self.class.name)
     end
 
     # Report bundled content, this should capture plans run from both CLI and Plans

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

@@ -58,7 +58,7 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
     executor = Puppet.lookup(:bolt_executor)
     inventory = Puppet.lookup(:bolt_inventory)
 
-    executor.report_function_call('run_script')
+    executor.report_function_call(self.class.name)
 
     found = Puppet::Parser::Files.find_file(script, scope.compiler.environment)
     unless found && Puppet::FileSystem.exist?(found)

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

@@ -56,7 +56,7 @@ Puppet::Functions.create_function(:run_task) do
     # Bolt calls this function internally to trigger tasks from the CLI. We
     # don't want to count those invocations.
     unless task_args['_bolt_api_call']
-      executor.report_function_call('run_task')
+      executor.report_function_call(self.class.name)
     end
 
     # Report bundled content, this should capture tasks run from both CLI and Plans

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

@@ -32,7 +32,7 @@ Puppet::Functions.create_function(:set_feature) do
 
     inventory = Puppet.lookup(:bolt_inventory)
     executor = Puppet.lookup(:bolt_executor)
-    executor.report_function_call('set_feature')
+    executor.report_function_call(self.class.name)
 
     inventory.set_feature(target, feature, value)
 

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

@@ -26,7 +26,7 @@ Puppet::Functions.create_function(:set_var) do
 
     inventory = Puppet.lookup(:bolt_inventory)
     executor = Puppet.lookup(:bolt_executor)
-    executor.report_function_call('set_var')
+    executor.report_function_call(self.class.name)
 
     inventory.set_var(target, key, value)
   end

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

@@ -62,7 +62,7 @@ Puppet::Functions.create_function(:upload_file, Puppet::Functions::InternalFunct
     executor = Puppet.lookup(:bolt_executor)
     inventory = Puppet.lookup(:bolt_inventory)
 
-    executor.report_function_call('upload_file')
+    executor.report_function_call(self.class.name)
 
     found = Puppet::Parser::Files.find_file(source, scope.compiler.environment)
     unless found && Puppet::FileSystem.exist?(found)

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

@@ -21,7 +21,7 @@ Puppet::Functions.create_function(:vars) do
     inventory = Puppet.lookup(:bolt_inventory)
     # Bolt executor not expected when invoked from apply block
     executor = Puppet.lookup(:bolt_executor) { nil }
-    executor&.report_function_call('vars')
+    executor&.report_function_call(self.class.name)
 
     inventory.vars(target)
   end

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

@@ -29,7 +29,7 @@ Puppet::Functions.create_function(:wait_until_available) do
     executor = Puppet.lookup(:bolt_executor)
     inventory = Puppet.lookup(:bolt_inventory)
 
-    executor.report_function_call('wait_until_available')
+    executor.report_function_call(self.class.name)
 
     # Ensure that given targets are all Target instances
     targets = inventory.get_targets(targets)

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

@@ -29,7 +29,7 @@ Puppet::Functions.create_function(:without_default_logging) do
     end
 
     executor = Puppet.lookup(:bolt_executor)
-    executor.report_function_call('without_default_logging')
+    executor.report_function_call(self.class.name)
 
     executor.without_default_logging do
       yield

data/bolt-modules/ctrl/lib/puppet/functions/ctrl/do_until.rb

@@ -11,6 +11,7 @@ Puppet::Functions.create_function(:'ctrl::do_until') do
   end
 
   def do_until
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
     until (x = yield); end
     x
   end

data/bolt-modules/ctrl/lib/puppet/functions/ctrl/sleep.rb

@@ -11,6 +11,7 @@ Puppet::Functions.create_function(:'ctrl::sleep') do
   end
 
   def sleeper(period)
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
     sleep(period)
     nil
   end

data/bolt-modules/file/lib/puppet/functions/file/exists.rb

@@ -14,6 +14,7 @@ Puppet::Functions.create_function(:'file::exists', Puppet::Functions::InternalFu
   end
 
   def exists(scope, filename)
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
     found = Puppet::Parser::Files.find_file(filename, scope.compiler.environment)
     found && Puppet::FileSystem.exist?(found)
   end

data/bolt-modules/file/lib/puppet/functions/file/read.rb

@@ -14,6 +14,7 @@ Puppet::Functions.create_function(:'file::read', Puppet::Functions::InternalFunc
   end
 
   def read(scope, filename)
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
     found = Puppet::Parser::Files.find_file(filename, scope.compiler.environment)
     unless found && Puppet::FileSystem.exist?(found)
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(

data/bolt-modules/file/lib/puppet/functions/file/readable.rb

@@ -14,6 +14,7 @@ Puppet::Functions.create_function(:'file::readable', Puppet::Functions::Internal
   end
 
   def readable(scope, filename)
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
     found = Puppet::Parser::Files.find_file(filename, scope.compiler.environment)
     found && File.readable?(found)
   end

data/bolt-modules/file/lib/puppet/functions/file/write.rb

@@ -13,6 +13,7 @@ Puppet::Functions.create_function(:'file::write') do
   end
 
   def write(filename, content)
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
     File.write(filename, content)
     nil
   end

data/bolt-modules/out/lib/puppet/functions/out/message.rb

@@ -22,6 +22,7 @@ Puppet::Functions.create_function(:'out::message') do
     end
 
     executor = Puppet.lookup(:bolt_executor)
+    executor.report_function_call(self.class.name)
     executor.publish_event(type: :message, message: message)
 
     nil

data/bolt-modules/system/lib/puppet/functions/system/env.rb

@@ -11,6 +11,7 @@ Puppet::Functions.create_function(:'system::env') do
   end
 
   def env(name)
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
     ENV[name]
   end
 end

data/lib/bolt/cli.rb

@@ -310,7 +310,7 @@ module Bolt
       when 'plan'
         code = run_plan(options[:object], options[:task_options], options[:target_args], options)
       when 'puppetfile'
-        code = install_puppetfile(@config.puppetfile, @config.modulepath)
+        code = install_puppetfile(@config.puppetfile_config, @config.puppetfile, @config.modulepath)
       when 'apply'
         if options[:object]
           validate_file('manifest', options[:object])
@@ -451,18 +451,21 @@ module Bolt
       outputter.print_module_list(pal.list_modules)
     end
 
-    def install_puppetfile(puppetfile, modulepath)
-      require 'r10k/action/puppetfile/install'
+    def install_puppetfile(config, puppetfile, modulepath)
+      require 'r10k/cli'
       require 'bolt/r10k_log_proxy'
 
       if puppetfile.exist?
         moduledir = modulepath.first.to_s
-        r10k_config = {
+        r10k_opts = {
           root: puppetfile.dirname.to_s,
           puppetfile: puppetfile.to_s,
           moduledir: moduledir
         }
-        install_action = R10K::Action::Puppetfile::Install.new(r10k_config, nil)
+
+        settings = R10K::Settings.global_settings.evaluate(config)
+        R10K::Initializers::GlobalInitializer.new(settings).call
+        install_action = R10K::Action::Puppetfile::Install.new(r10k_opts, nil)
 
         # Override the r10k logger with a proxy to our own logger
         R10K::Logging.instance_variable_set(:@outputter, Bolt::R10KLogProxy.new)

data/lib/bolt/config.rb

@@ -32,13 +32,16 @@ module Bolt
 
   class Config
     attr_accessor :concurrency, :format, :trace, :log, :puppetdb, :color, :save_rerun,
-                  :transport, :transports, :inventoryfile, :compile_concurrency, :boltdir
+                  :transport, :transports, :inventoryfile, :compile_concurrency, :boltdir,
+                  :puppetfile_config
     attr_writer :modulepath
 
     TRANSPORT_OPTIONS = %i[password run-as sudo-password extensions
                            private-key tty tmpdir user connect-timeout
                            cacert token-file service-url interpreters file-protocol smb-port].freeze
 
+    PUPPETFILE_OPTIONS = %w[proxy].freeze
+
     def self.default
       new(Bolt::Boltdir.new('.'), {})
     end
@@ -66,6 +69,7 @@ module Bolt
       @puppetdb = {}
       @color = true
       @save_rerun = true
+      @puppetfile_config = {}
 
       # add an entry for the default console logger
       @log = { 'console' => {} }
@@ -145,6 +149,10 @@ module Bolt
 
       @inventoryfile = File.expand_path(data['inventoryfile'], @boltdir.path) if data.key?('inventoryfile')
 
+      if data.key?('puppetfile')
+        @puppetfile_config = data['puppetfile'].select { |k, _| PUPPETFILE_OPTIONS.include?(k) }
+      end
+
       @hiera_config = File.expand_path(data['hiera-config'], @boltdir.path) if data.key?('hiera-config')
       @compile_concurrency = data['compile-concurrency'] if data.key?('compile-concurrency')
 

data/lib/bolt/inventory/group2.rb

@@ -16,11 +16,16 @@ module Bolt
       GROUP_KEYS = DATA_KEYS + %w[groups targets target-lookups]
       CONFIG_KEYS = Bolt::TRANSPORTS.keys.map(&:to_s) + ['transport']
 
-      def initialize(data)
+      def initialize(data, plugins)
         @logger = Logging.logger[self]
-
         raise ValidationError.new("Expected group to be a Hash, not #{data.class}", nil) unless data.is_a?(Hash)
+        raise ValidationError.new("Cannot set group with plugin", nil) if data.key?('_plugin')
         raise ValidationError.new("Group does not have a name", nil) unless data.key?('name')
+        @plugins = plugins
+
+        %w[name vars features facts].each do |key|
+          validate_config_plugin(data[key], key, nil)
+        end
 
         @name = data['name']
         raise ValidationError.new("Group name must be a String, not #{@name.inspect}", nil) unless @name.is_a?(String)
@@ -34,7 +39,8 @@ module Bolt
         @vars = fetch_value(data, 'vars', Hash)
         @facts = fetch_value(data, 'facts', Hash)
         @features = fetch_value(data, 'features', Array)
-        @config = fetch_value(data, 'config', Hash)
+
+        @config = config_only_plugin(fetch_value(data, 'config', Hash))
 
         @target_lookups = fetch_value(data, 'target-lookups', Array)
 
@@ -60,9 +66,41 @@ module Bolt
           end
         end
 
-        @groups = groups.map { |g| Group2.new(g) }
+        @groups = groups.map { |g| Group2.new(g, plugins) }
       end
 
+      def validate_config_plugin(data, key, group_name = nil)
+        if data.is_a?(Hash) && data.include?('_plugin')
+          if group_name
+            raise ValidationError.new("Cannot set target #{key.inspect} with plugin", group_name)
+          else
+            raise ValidationError.new("Cannot set group #{key.inspect} with plugin", nil)
+          end
+        end
+        if data.is_a? Hash
+          data.each do |_k, v|
+            validate_config_plugin(v, key, group_name)
+          end
+        elsif data.is_a? Array
+          data.map { |v| validate_config_plugin(v, key, group_name) }
+        end
+      end
+      private :validate_config_plugin
+
+      def config_only_plugin(data)
+        Bolt::Util.walk_vals(data) do |value|
+          if value.is_a?(Hash) && value.include?('_plugin')
+            unless (plugin = @plugins.by_name(value['_plugin']))
+              raise ValidationError.new("unkown plugin: #{value['_plugin'].inspect}", nil)
+            end
+            plugin.new.inventory_config_lookup(value)
+          else
+            value
+          end
+        end
+      end
+      private :config_only_plugin
+
       def target_data(target_name)
         if (data = @targets[target_name])
           { 'config' => data['config'] || {},
@@ -83,6 +121,11 @@ module Bolt
         unless target.is_a?(Hash)
           raise ValidationError.new("Node entry must be a String or Hash, not #{target.class}", @name)
         end
+        raise ValidationError.new("Cannot set target with plugin", @name) if target.key?('_plugin')
+        target.each do |k, v|
+          next if k == 'config'
+          validate_config_plugin(v, k, @name)
+        end
 
         target['name'] ||= target['uri']
 
@@ -113,6 +156,7 @@ module Bolt
           @logger.warn(msg)
         end
 
+        target['config'] = config_only_plugin(target['config'])
         unless target.include?('alias')
           return
         end
@@ -145,7 +189,6 @@ module Bolt
 
           unless (plugin = plugins.by_name(lookup['plugin']))
             raise ValidationError.new("target-lookup specifies an unkown plugin: '#{lookup['plugin']}'", @name)
-
           end
 
           targets = plugin.lookup_targets(lookup)

data/lib/bolt/inventory/inventory2.rb

@@ -16,13 +16,12 @@ module Bolt
         @logger = Logging.logger[self]
         # Config is saved to add config options to targets
         @config = config || Bolt::Config.default
-        @data = data ||= {}
-        @groups = Group2.new(data.merge('name' => 'all'))
+        @data = data || {}
+        @groups = Group2.new(@data.merge('name' => 'all'), plugins)
         @group_lookup = {}
         @target_vars = target_vars
         @target_facts = target_facts
         @target_features = target_features
-
         @groups.lookup_targets(plugins)
         @groups.resolve_aliases(@groups.target_aliases, @groups.target_names)
         collect_groups
@@ -103,13 +102,13 @@ module Bolt
 
       def data_hash
         {
-          data: @data,
+          data: {},
           target_hash: {
-            target_vars: @target_vars,
-            target_facts: @target_facts,
-            target_features: @target_features
+            target_vars: {},
+            target_facts: {},
+            target_features: {}
           },
-          config: @config.transport_data_get
+          config: { transports: {} }
         }
       end
 
@@ -121,6 +120,18 @@ module Bolt
       end
       private :groups_in
 
+      # Look for _plugins
+      def config_plugin(data)
+        Bolt::Util.walk_vals(data) do |val|
+          if val.is_a?(Concurrent::Delay)
+            val.value
+          else
+            val
+          end
+        end
+      end
+      private :config_plugin
+
       # Pass a target to get_targets for a public version of this
       # Should this reconfigure configured targets?
       def update_target(target)
@@ -138,6 +149,7 @@ module Bolt
         set_vars_from_hash(target.name, data['vars']) unless @target_vars[target.name]
         set_facts(target.name, data['facts']) unless @target_facts[target.name]
         data['features']&.each { |feature| set_feature(target, feature) } unless @target_features[target.name]
+        data['config'] = config_plugin(data['config'])
 
         # Use Config object to ensure config section is treated consistently with config file
         conf = @config.deep_clone

data/lib/bolt/plugin.rb

@@ -2,6 +2,7 @@
 
 require 'bolt/plugin/puppetdb'
 require 'bolt/plugin/terraform'
+require 'bolt/plugin/prompt'
 
 module Bolt
   class Plugin
@@ -9,6 +10,7 @@ module Bolt
       plugins = new(config)
       plugins.add_plugin(Bolt::Plugin::Puppetdb.new(pdb_client))
       plugins.add_plugin(Bolt::Plugin::Terraform.new)
+      plugins.add_plugin(Bolt::Plugin::Prompt)
       plugins
     end
 

data/lib/bolt/plugin/prompt.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'concurrent/delay'
+module Bolt
+  class Plugin
+    class Prompt
+      def initialize
+        # Might not need this
+        @logger = Logging.logger[self]
+      end
+
+      def self.name
+        'prompt'
+      end
+
+      def hooks
+        ['inventory_config_lookup']
+      end
+
+      def inventory_config_lookup(opts)
+        raise Bolt::ValidationError, "Prompt requires a 'message'" unless opts['message']
+        # Return a delay to only be evaluated when needed
+        Concurrent::Delay.new do
+          STDOUT.print "#{opts['message']}:"
+          value = STDIN.noecho(&:gets).chomp
+          STDOUT.puts
+          value
+        end
+      end
+    end
+  end
+end

data/lib/bolt/plugin/terraform.rb

@@ -24,29 +24,22 @@ module Bolt
       def lookup_targets(opts)
         state = load_statefile(opts)
 
-        resources = state.fetch('modules', {}).flat_map do |mod|
-          mod.fetch('resources', {}).map do |name, resource|
-            [name, resource.dig('primary', 'attributes')]
-          end
-        end
+        resources = extract_resources(state)
 
         regex = Regexp.new(opts['resource_type'])
 
         resources.select do |name, _resource|
           name.match?(regex)
         end.map do |name, resource|
-          unless resource.key?(opts['uri'])
-            warn_missing_property(name, opts['uri'])
-            next
-          end
+          target = {}
 
-          target = { 'uri' => resource[opts['uri']] }
+          if opts.key?('uri')
+            uri = lookup(name, resource, opts['uri'])
+            target['uri'] = uri if uri
+          end
           if opts.key?('name')
-            if resource.key?(opts['name'])
-              target['name'] = resource[opts['name']]
-            else
-              warn_missing_property(name, opts['name'])
-            end
+            real_name = lookup(name, resource, opts['name'])
+            target['name'] = real_name if real_name
           end
           if opts.key?('config')
             target['config'] = resolve_config(name, resource, opts['config'])
@@ -65,15 +58,57 @@ module Bolt
         raise Bolt::FileError.new("Could not load Terraform state file #{filename}: #{e}", filename)
       end
 
+      # Format the list of resources into a list of [name, attribute map]
+      # pairs. This method handles both version 4 and earlier statefiles, doing
+      # the appropriate munging based on the shape of the data.
+      def extract_resources(state)
+        if state['version'] >= 4
+          state.fetch('resources', []).flat_map do |resource_set|
+            prefix = "#{resource_set['type']}.#{resource_set['name']}"
+            resource_set['instances'].map do |resource|
+              instance_name = prefix
+              instance_name += ".#{resource['index_key']}" if resource['index_key']
+
+              [instance_name, resource['attributes']]
+            end
+          end
+        else
+          state.fetch('modules', {}).flat_map do |mod|
+            mod.fetch('resources', {}).map do |name, resource|
+              [name, resource.dig('primary', 'attributes')]
+            end
+          end
+        end
+      end
+
+      # Look up a nested value from the resource attributes. The key is of the
+      # form `foo.bar.0.baz`. For terraform statefile version 3, this will
+      # exactly correspond to a key in the resource. In version 4, it will
+      # correspond to a nested hash entry at {foo: {bar: [{baz: <value>}]}}
+      # For simplicity's sake, we just check both.
+      def lookup(name, resource, path)
+        segments = path.split('.').map do |segment|
+          begin
+            Integer(segment)
+          rescue ArgumentError
+            segment
+          end
+        end
+
+        value = resource[path] || resource.dig(*segments)
+        unless value
+          warn_missing_property(name, path)
+        end
+        value
+      end
+
+      # Walk the "template" config mapping provided in the plugin config and
+      # replace all values with the corresponding value from the resource
+      # parameters.
       def resolve_config(name, resource, config_template)
         Bolt::Util.walk_vals(config_template) do |value|
           if value.is_a?(String)
-            if resource.key?(value)
-              resource[value]
-            else
-              warn_missing_property(name, value)
-              nil
-            end
+            lookup(name, resource, value)
           else
             value
           end

data/lib/bolt/task.rb

@@ -20,7 +20,6 @@ module Bolt
     :files,
     :metadata
   ) do
-
     attr_reader :remote
 
     def initialize(task, remote: false)

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -388,6 +388,7 @@ files:
 - lib/bolt/pal/yaml_plan/transpiler.rb
 - lib/bolt/plan_result.rb
 - lib/bolt/plugin.rb
+- lib/bolt/plugin/prompt.rb
 - lib/bolt/plugin/puppetdb.rb
 - lib/bolt/plugin/terraform.rb
 - lib/bolt/puppetdb.rb