bolt 2.42.0 → 2.44.0

data/lib/bolt/module_installer/specs/forge_spec.rb

@@ -13,14 +13,20 @@ module Bolt
       class ForgeSpec
         NAME_REGEX    = %r{\A[a-zA-Z0-9]+[-/](?<name>[a-z][a-z0-9_]*)\z}.freeze
         REQUIRED_KEYS = Set.new(%w[name]).freeze
-        KNOWN_KEYS    = Set.new(%w[name version_requirement]).freeze
+        KNOWN_KEYS    = Set.new(%w[name resolve version_requirement]).freeze
 
-        attr_reader :full_name, :name, :semantic_version, :type
+        attr_reader :full_name, :name, :resolve, :semantic_version, :type, :version_requirement
 
         def initialize(init_hash)
+          @resolve                                = init_hash.key?('resolve') ? init_hash['resolve'] : true
           @full_name, @name                       = parse_name(init_hash['name'])
           @version_requirement, @semantic_version = parse_version_requirement(init_hash['version_requirement'])
           @type                                   = :forge
+
+          unless @resolve == true || @resolve == false
+            raise Bolt::ValidationError,
+                  "Option 'resolve' for module spec #{@full_name} must be a Boolean"
+          end
         end
 
         def self.implements?(hash)

data/lib/bolt/module_installer/specs/git_spec.rb

@@ -13,18 +13,31 @@ module Bolt
       class GitSpec
         NAME_REGEX    = %r{\A(?:[a-zA-Z0-9]+[-/])?(?<name>[a-z][a-z0-9_]*)\z}.freeze
         REQUIRED_KEYS = Set.new(%w[git ref]).freeze
+        KNOWN_KEYS    = Set.new(%w[git name ref resolve]).freeze
 
-        attr_reader :git, :ref, :type
+        attr_reader :git, :ref, :resolve, :type
 
         def initialize(init_hash)
+          @resolve    = init_hash.key?('resolve') ? init_hash['resolve'] : true
           @name       = parse_name(init_hash['name'])
           @git, @repo = parse_git(init_hash['git'])
           @ref        = init_hash['ref']
           @type       = :git
+
+          if @name.nil? && @resolve == false
+            raise Bolt::ValidationError,
+                  "Missing name for Git module specification: #{@git}. Git module specifications "\
+                  "must include a 'name' key when 'resolve' is false."
+          end
+
+          unless @resolve == true || @resolve == false
+            raise Bolt::ValidationError,
+                  "Option 'resolve' for module spec #{@git} must be a Boolean"
+          end
         end
 
         def self.implements?(hash)
-          REQUIRED_KEYS == hash.keys.to_set
+          KNOWN_KEYS.superset?(hash.keys.to_set) && REQUIRED_KEYS.subset?(hash.keys.to_set)
         end
 
         # Parses the name into owner and name segments, and formats the full
@@ -47,6 +60,8 @@ module Bolt
         # Gets the repo from the git URL.
         #
         private def parse_git(git)
+          return [git, nil] unless @resolve
+
           repo = if git.start_with?('git@github.com:')
                    git.split('git@github.com:').last.split('.git').first
                  elsif git.start_with?('https://github.com')

data/lib/bolt/outputter/human.rb

@@ -32,8 +32,8 @@ module Bolt
       end
 
       def start_spin
-        return unless @spin && @stream.isatty
-        @spin = true
+        return unless @spin && @stream.isatty && !@spinning
+        @spinning = true
         @spin_thread = Thread.new do
           loop do
             sleep(0.1)
@@ -43,9 +43,9 @@ module Bolt
       end
 
       def stop_spin
-        return unless @spin && @stream.isatty
+        return unless @spin && @stream.isatty && @spinning
+        @spinning = false
         @spin_thread.terminate
-        @spin = false
         @stream.print("\b")
       end
 
@@ -81,6 +81,10 @@ module Bolt
             print_plan_start(event)
           when :plan_finish
             print_plan_finish(event)
+          when :start_spin
+            start_spin
+          when :stop_spin
+            stop_spin
           end
         end
       end

data/lib/bolt/outputter/rainbow.rb

@@ -63,12 +63,12 @@ module Bolt
       end
 
       def start_spin
-        return unless @spin && @stream.isatty
-        @spin = true
+        return unless @spin && @stream.isatty && !@spinning
+        @spinning = true
         @spin_thread = Thread.new do
           loop do
-            @stream.print(colorize(:rainbow, @pinwheel.rotate!.first + "\b"))
             sleep(0.1)
+            @stream.print(colorize(:rainbow, @pinwheel.rotate!.first + "\b"))
           end
         end
       end

data/lib/bolt/pal.rb

@@ -153,8 +153,10 @@ module Bolt
         Dir.children(path).select { |name| Puppet::Module.is_module_directory?(name, path) }
       end
       if modules.include?(project.name)
-        Bolt::Logger.warn_once("project shadows module",
-                               "The project '#{project.name}' shadows an existing module of the same name")
+        Bolt::Logger.warn_once(
+          "project_shadows_module",
+          "The project '#{project.name}' shadows an existing module of the same name"
+        )
       end
     end
 
@@ -357,19 +359,52 @@ module Bolt
       Bolt::Task.from_task_signature(task)
     end
 
+    def list_plans_with_cache(filter_content: false)
+      # Don't filter content yet, so that if users update their plan filters
+      # we don't need to refresh the cache
+      plan_names = list_plans(filter_content: false).map(&:first)
+      plan_cache = if @project
+                     Bolt::Util.read_optional_json_file(@project.plan_cache_file, 'Plan cache file')
+                   else
+                     {}
+                   end
+      updated = false
+
+      plan_list = plan_names.each_with_object([]) do |plan_name, list|
+        info = 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 info['file'] &&
+           (File.mtime(info.dig('file', 'path')) <=> info.dig('file', 'mtime')) != 0
+          info = get_plan_info(plan_name, with_mtime: true)
+          updated = true
+          plan_cache[plan_name] = info
+        end
+
+        list << [plan_name] unless info['private']
+      end
+
+      File.write(@project.plan_cache_file, plan_cache.to_json) if updated
+
+      filter_content ? filter_content(plan_list, @project&.plans) : plan_list
+    end
+
     def list_plans(filter_content: false)
       in_bolt_compiler do |compiler|
         errors = []
         plans = compiler.list_plans(nil, errors).map { |plan| [plan.name] }.sort
         errors.each do |error|
-          @logger.warn(error.details['original_error'])
+          Bolt::Logger.warn("plan_load_error", error.details['original_error'])
         end
 
         filter_content ? filter_content(plans, @project&.plans) : plans
       end
     end
 
-    def get_plan_info(plan_name)
+    def get_plan_info(plan_name, with_mtime: false)
       plan_sig = in_bolt_compiler do |compiler|
         compiler.plan_signature(plan_name)
       end
@@ -412,16 +447,28 @@ module Bolt
             params[name]['default_value'] = defaults[name] if defaults.key?(name)
             params[name]['description'] = param.text unless param.text.empty?
           else
-            @logger.warn("The documented parameter '#{name}' does not exist in plan signature")
+            Bolt::Logger.warn(
+              "missing_plan_parameter",
+              "The documented parameter '#{name}' does not exist in plan signature"
+            )
           end
         end
 
-        {
-          'name' => plan_name,
+        privie = plan.tag(:private)&.text
+        unless privie.nil? || %w[true false].include?(privie.downcase)
+          msg = "Plan #{plan_name} key 'private' must be a boolean, received: #{privie}"
+          raise Bolt::Error.new(msg, 'bolt/invalid-plan')
+        end
+
+        pp_info = {
+          'name'        => plan_name,
           'description' => description,
-          'parameters' => parameters,
-          'module' => mod
+          'parameters'  => parameters,
+          'module'      => mod
         }
+        pp_info.merge!({ 'private' => privie&.downcase == 'true' }) unless privie.nil?
+        pp_info.merge!(get_plan_mtime(plan.file)) if with_mtime
+        pp_info
 
       # If it's a YAML plan, fall back to limited data
       else
@@ -444,12 +491,32 @@ module Bolt
           params[name]['default_value'] = param.value unless param.value.nil?
           params[name]['description'] = param.description if param.description
         end
-        {
-          'name' => plan_name,
+
+        yaml_info = {
+          'name'        => plan_name,
           'description' => plan.description,
-          'parameters' => parameters,
-          'module' => mod
+          'parameters'  => parameters,
+          'module'      => mod
         }
+        yaml_info.merge!({ 'private' => plan.private }) unless plan.private.nil?
+        yaml_info.merge!(get_plan_mtime(yaml_path)) if with_mtime
+        yaml_info
+      end
+    end
+
+    def get_plan_mtime(path)
+      # If the plan is from the project modules/ directory, or is in the
+      # project itself, include the last mtime of the file so we can compare
+      # if the plan has been updated since it was cached.
+      if @project &&
+         File.exist?(path) &&
+         (path.include?(File.join(@project.path, 'modules')) ||
+          path.include?(@project.plans_path.to_s))
+
+        { 'file' => { 'mtime' => File.mtime(path),
+                      'path' => path } }
+      else
+        {}
       end
     end
 
@@ -490,16 +557,28 @@ module Bolt
       end
     end
 
-    def generate_types
+    def generate_types(cache: false)
       require 'puppet/face/generate'
       in_bolt_compiler do
         generator = Puppet::Generate::Type
         inputs = generator.find_inputs(:pcore)
         FileUtils.mkdir_p(@resource_types)
+        cache_plan_info if @project && cache
         generator.generate(inputs, @resource_types, true)
       end
     end
 
+    def cache_plan_info
+      # plan_name is an array here
+      plans_info = list_plans(filter_content: false).map do |plan_name,|
+        data = get_plan_info(plan_name, with_mtime: true)
+        { plan_name => data }
+      end.reduce({}, :merge)
+
+      FileUtils.touch(@project.plan_cache_file)
+      File.write(@project.plan_cache_file, plans_info.to_json)
+    end
+
     def run_task(task_name, targets, params, executor, inventory, description = nil)
       in_task_compiler(executor, inventory) do |compiler|
         params = params.merge('_bolt_api_call' => true, '_catch_errors' => true)

data/lib/bolt/pal/yaml_plan.rb

@@ -6,10 +6,10 @@ require 'bolt/pal/yaml_plan/step'
 module Bolt
   class PAL
     class YamlPlan
-      PLAN_KEYS = Set['parameters', 'steps', 'return', 'version', 'description']
+      PLAN_KEYS = Set['parameters', 'private', 'steps', 'return', 'version', 'description']
       VAR_NAME_PATTERN = /\A[a-z_][a-z0-9_]*\z/.freeze
 
-      attr_reader :name, :parameters, :steps, :return, :description
+      attr_reader :name, :parameters, :private, :steps, :return, :description
 
       def initialize(name, plan)
         # Top-level plan keys aren't allowed to be Puppet code, so force them
@@ -30,6 +30,12 @@ module Bolt
           Parameter.new(param, definition)
         end.freeze
 
+        @private = plan['private']
+        unless @private.nil? || @private.is_a?(TrueClass) || @private.is_a?(FalseClass)
+          msg = "Plan #{@name} key 'private' must be a boolean, received: #{@private.inspect}"
+          raise Bolt::Error.new(msg, "bolt/invalid-plan")
+        end
+
         # Validate top level plan keys
         top_level_keys = plan.keys.to_set
         unless PLAN_KEYS.superset?(top_level_keys)

data/lib/bolt/pal/yaml_plan/evaluator.rb

@@ -157,13 +157,13 @@ module Bolt
           if plan.steps.any? { |step| step.body.key?('target') }
             msg = "The 'target' parameter for YAML plan steps is deprecated and will be removed "\
                   "in a future version of Bolt. Use the 'targets' parameter instead."
-            Bolt::Logger.deprecation_warning("Using 'target' parameter for YAML plan steps, not 'targets'", msg)
+            Bolt::Logger.deprecate("yaml_plan_target", msg)
           end
 
           if plan.steps.any? { |step| step.body.key?('source') }
             msg = "The 'source' parameter for YAML plan upload steps is deprecated and will be removed "\
                   "in a future version of Bolt. Use the 'upload' parameter instead."
-            Bolt::Logger.deprecation_warning("Using 'source' parameter for YAML upload steps, not 'upload'", msg)
+            Bolt::Logger.deprecate("yaml_plan_source", msg)
           end
 
           plan_result = closure_scope.with_local_scope(args_hash) do |scope|

data/lib/bolt/pal/yaml_plan/transpiler.rb

@@ -30,6 +30,7 @@ module Bolt
           plan_string = String.new('')
           plan_string << "# #{plan_object.description}\n" if plan_object.description
           plan_string << "# WARNING: This is an autogenerated plan. It may not behave as expected.\n"
+          plan_string << "# @private #{plan_object.private}\n" unless plan_object.private.nil?
           plan_string << "#{param_descriptions}\n" unless param_descriptions.empty?
 
           plan_string << "plan #{plan_object.name}("

data/lib/bolt/plugin.rb

@@ -139,7 +139,7 @@ module Bolt
       plugins
     end
 
-    RUBY_PLUGINS = %w[task prompt env_var puppetdb].freeze
+    RUBY_PLUGINS = %w[task prompt env_var puppetdb puppet_connect_data].freeze
     BUILTIN_PLUGINS = %w[task terraform pkcs7 prompt vault aws_inventory puppetdb azure_inventory
                          yaml env_var gcloud_inventory].freeze
     DEFAULT_PLUGIN_HOOKS = { 'puppet_library' => { 'plugin' => 'puppet_agent', 'stop_service' => true } }.freeze
@@ -297,7 +297,7 @@ module Bolt
     def resolve_single_reference(reference)
       plugin_cache = if cache?(reference)
                        cache = Bolt::Plugin::Cache.new(reference,
-                                                       @config.project.cache_file,
+                                                       @config.project.plugin_cache_file,
                                                        @config.plugin_cache)
                        entry = cache.read_and_clean_cache
                        return entry unless entry.nil?

data/lib/bolt/plugin/cache.rb

@@ -7,11 +7,11 @@ require 'bolt/util'
 module Bolt
   class Plugin
     class Cache
-      attr_reader :reference, :cache_file, :default_config, :id
+      attr_reader :reference, :plugin_cache_file, :default_config, :id
 
-      def initialize(reference, cache_file, default_config)
+      def initialize(reference, plugin_cache_file, default_config)
         @reference = reference
-        @cache_file = cache_file
+        @plugin_cache_file = plugin_cache_file
         @default_config = default_config
       end
 
@@ -32,21 +32,21 @@ module Bolt
           unmodified = false if expired
           expired
         end
-        File.write(cache_file, cache.to_json) unless cache.empty? || unmodified
+        File.write(plugin_cache_file, cache.to_json) unless cache.empty? || unmodified
 
         cache.dig(id, 'result')
       end
 
       private def cache
-        @cache ||= Bolt::Util.read_optional_json_file(@cache_file, 'cache')
+        @cache ||= Bolt::Util.read_optional_json_file(@plugin_cache_file, 'cache')
       end
 
       def write_cache(result)
         cache.merge!({ id => { 'result' => result,
                                'mtime' => Time.now,
                                'ttl' => ttl } })
-        FileUtils.touch(cache_file)
-        File.write(cache_file, cache.to_json)
+        FileUtils.touch(plugin_cache_file)
+        File.write(plugin_cache_file, cache.to_json)
       end
 
       def validate

data/lib/bolt/plugin/module.rb

@@ -187,7 +187,7 @@ module Bolt
         if params.key?('private-key') || params.key?('public-key')
           message = "pkcs7 keys 'private-key' and 'public-key' have been deprecated and will be "\
                     "removed in a future version of Bolt; use 'private_key' and 'public_key' instead."
-          Bolt::Logger.deprecation_warning('PKCS7 keys using hyphens, not underscores', message)
+          Bolt::Logger.deprecate("pkcs7_params", message)
         end
 
         params['private_key'] = params.delete('private-key') if params.key?('private-key')

data/lib/bolt/plugin/puppet_connect_data.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Bolt
+  class Plugin
+    class PuppetConnectData
+      def initialize(context:, **_opts)
+        puppet_connect_data_yaml_path = File.join(context.boltdir, 'puppet_connect_data.yaml')
+        @data = Bolt::Util.read_optional_yaml_hash(
+          puppet_connect_data_yaml_path,
+          'puppet_connect_data.yaml'
+        )
+      end
+
+      def name
+        'puppet_connect_data'
+      end
+
+      def hooks
+        %i[resolve_reference validate_resolve_reference]
+      end
+
+      def resolve_reference(opts)
+        key = opts['key']
+        @data[key]
+      end
+
+      def validate_resolve_reference(opts)
+        unless opts['key']
+          raise Bolt::ValidationError,
+                "puppet_connect_data plugin requires that 'key' be specified"
+        end
+      end
+    end
+  end
+end

data/lib/bolt/plugin/puppetdb.rb

@@ -31,7 +31,7 @@ module Bolt
       end
 
       def warn_missing_fact(certname, fact)
-        @logger.warn("Could not find fact #{fact} for node #{certname}")
+        Bolt::Logger.warn("puppetdb_missing_fact", "Could not find fact #{fact} for node #{certname}")
       end
 
       def fact_path(raw_fact)