bolt 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef5e67102ddbc1b3ef1c0d08352fd5392766b73f3686e54ca62e9f5e09141356
-  data.tar.gz: dc371bb5483705f7c7dbca0be037aad53338e27480faf1f884eb669f8c14fbb2
+  metadata.gz: 6b7b8c5255bf4fcfcfe96a63f2dd479a92018a0a5cccd3898d1ad405232ad7ff
+  data.tar.gz: 83cb6eb774b74151c3b6eee76562c0c588da592b3f97a6d744995330cceb7079
 SHA512:
-  metadata.gz: 7efd326949ec4d661ff4d4471d9626dcf2688a5e0f699f777d70537135493b2b55250054b6de1989f933a23c8aafb6e2124a7062d32f398218529fd6550ff2b7
-  data.tar.gz: ac92568d449f852bc39e0c824c9fe6e3c13cee329fa6c5a3bfc1794b01a9b4b9278124456fe4adfd9cebe2ec0056ab42651b5f1aa4f1a56402a743c7893e42a3
+  metadata.gz: dfddff8a230e8995804f304e79f0de6a2aa04149fae2c9c5ba1412afb073e5aab31e0c922b14935344c65672195f757e5326e7a7dbd7995acb97b98d154adbc8
+  data.tar.gz: f4bc0bfe2f2f12f94c2fe93e0caf2ce6a011b0e25a8d5e933632d6438e86232ec931936d66734bcbba2a955164ef5989f95a271d22aab963d58376d4ed5d6dd3

data/Puppetfile

@@ -6,7 +6,7 @@ moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
 mod 'puppetlabs-service', '2.0.0'
-mod 'puppetlabs-puppet_agent', '4.7.0'
+mod 'puppetlabs-puppet_agent', '4.8.0'
 mod 'puppetlabs-facts', '1.4.0'
 
 # Core types and providers for Puppet 6

data/lib/bolt/applicator.rb

@@ -122,7 +122,13 @@ module Bolt
         logs.each do |log|
           bolt_level = Bolt::Util::PuppetLogLevel::MAPPING[log['level'].to_sym]
           message = log['message'].chomp
-          @logger.send(bolt_level, "#{target.name}: #{message}")
+
+          case bolt_level
+          when :warn
+            handle_warning(target, message)
+          else
+            @logger.send(bolt_level, "#{target.name}: #{message}")
+          end
         end
       end
 
@@ -138,6 +144,22 @@ module Bolt
       result
     end
 
+    # Handles logging Puppet warnings, some of which are suppressable.
+    #
+    # @param target [Bolt::Target] The target the apply ran on.
+    # @param message [String] The log message.
+    #
+    private def handle_warning(target, message)
+      # Messages about exported resource declaration and collection, which are
+      # not supported in manifest blocks.
+      if message.include?(Puppet::Pops::Issues::RT_NO_STORECONFIGS_EXPORT.format) ||
+         message.include?(Puppet::Pops::Issues::RT_NO_STORECONFIGS.format)
+        Bolt::Logger.warn('exported_resources', "#{target.name}: #{message}")
+      else
+        @logger.send(:warn, "#{target.name}: #{message}")
+      end
+    end
+
     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]) }

data/lib/bolt/error.rb

@@ -69,7 +69,7 @@ module Bolt
         'value' => result.value,
         'object' => result.object
       }
-      message = "Plan aborted: Running container '#{result.object}' failed."
+      message = "Running container '#{result.object}' failed."
       super(message, 'bolt/container-failure', details)
       @result = result
       @error_code = 2
@@ -86,7 +86,7 @@ module Bolt
         'result_set' => result_set
       }
       object_msg = " '#{object}'" if object
-      message = "Plan aborted: #{action}#{object_msg} failed on #{result_set.error_set.length} target"
+      message = "#{action}#{object_msg} failed on #{result_set.error_set.length} target"
       message += "s" unless result_set.error_set.length == 1
       super(message, 'bolt/run-failure', details)
       @result_set = result_set
@@ -122,7 +122,7 @@ module Bolt
         'failed_indices' => failed_indices,
         'results' => results
       }
-      message = "Plan aborted: parallel block failed on #{failed_indices.length} target"
+      message = "parallel block failed on #{failed_indices.length} target"
       message += "s" unless failed_indices.length == 1
       super(message, 'bolt/parallel-failure', details)
       @error_code = 2

data/lib/bolt/outputter/human.rb

@@ -462,9 +462,11 @@ module Bolt
       end
 
       def print_topics(topics)
-        print_message("Available topics are:")
-        print_message(topics.join("\n"))
-        print_message("\nUse 'bolt guide <TOPIC>' to view a specific guide.")
+        info = +"#{colorize(:cyan, 'Topics')}\n"
+        info << indent(2, topics.join("\n"))
+        info << "\n\n#{colorize(:cyan, 'Additional information')}\n"
+        info << indent(2, "Use 'bolt guide <TOPIC>' to view a specific guide.")
+        @stream.puts info
       end
 
       def print_guide(guide, _topic)

data/lib/bolt/pal.rb

@@ -324,7 +324,7 @@ module Bolt
           data['files'].each do |f|
             # If any file has been updated since we last cached, update the
             # cache
-            next if File.mtime(f['path']).to_s == f['mtime']
+            next unless file_modified?(f['path'], f['mtime'])
             data = get_task_info(task_name, with_mtime: true)
             data = Bolt::Util.walk_keys(data, &:to_s)
             # Tell Bolt to write to the cache file once we're done
@@ -423,13 +423,10 @@ module Bolt
 
       plan_list = plan_names.each_with_object([]) do |plan_name, list|
         data = plan_cache[plan_name] || get_plan_info(plan_name, with_mtime: true)
-
-        # If the plan is a 'local' plan (in the project itself, or the
-        # modules/ directory) then verify it hasn't been updated since we
-        # cached it. If it has been updated, refresh the cache and use the
-        # new data.
-        if data['file'] &&
-           File.mtime(data.dig('file', 'path')).to_s != data.dig('file', 'mtime')
+        # If the plan is a 'local' plan (in the project itself, or the modules/
+        # directory) then verify it hasn't been updated since we cached it. If
+        # it has been updated, refresh the cache and use the new data.
+        if file_modified?(data.dig('file', 'path'), data.dig('file', 'mtime'))
           data = get_plan_info(plan_name, with_mtime: true)
           updated = true
           plan_cache[plan_name] = data
@@ -443,6 +440,16 @@ module Bolt
       filter_content ? filter_content(plan_list, @project&.plans) : plan_list
     end
 
+    # Returns true if a file has been modified or no longer exists, false
+    # otherwise.
+    #
+    # @param path [String] The path to the file.
+    # @param mtime [String] The last time the file was modified.
+    #
+    private def file_modified?(path, mtime)
+      path && !(File.exist?(path) && File.mtime(path).to_s == mtime)
+    end
+
     def list_plans(filter_content: false)
       in_bolt_compiler do |compiler|
         errors = []

data/lib/bolt/version.rb

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

data/lib/bolt_server/schemas/connect-data.json

@@ -16,7 +16,10 @@
         }
       },
       "additionalProperties": false
+    },
+    "versioned_project": {
+      "type": "string"
     }
   },
-  "required": ["puppet_connect_data"]
+  "required": ["puppet_connect_data", "versioned_project"]
 }

data/lib/bolt_server/transport_app.rb

@@ -637,11 +637,10 @@ module BoltServer
     #
     # @param versioned_project [String] the versioned_project to compute the inventory from
     post '/project_inventory_targets' do
-      raise BoltServer::RequestError, "'versioned_project' is a required argument" if params['versioned_project'].nil?
       content_type :json
       body = JSON.parse(request.body.read)
       validate_schema(@schemas["connect-data"], body)
-      in_bolt_project(params['versioned_project']) do |context|
+      in_bolt_project(body['versioned_project']) do |context|
         if context[:config].inventoryfile &&
            context[:config].project.inventory_file.to_s !=
            context[:config].inventoryfile

data/modules/canary/plans/init.pp

@@ -88,7 +88,7 @@ plan canary(
       $message = "Plan failed for ${merged_result.error_set.count} targets."
     }
     else {
-      $message = "Plan aborted. ${canr.error_set.count} canary target failures. ${restr.count} targets skipped."
+      $message = "${canr.error_set.count} canary target failures. ${restr.count} targets skipped."
     }
     $details = {'action' => $action,
                 'object' => $object,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable