bolt 3.15.0 → 3.18.0

data/lib/bolt_spec/bolt_context.rb

@@ -39,13 +39,15 @@ require 'bolt/plugin'
 #
 # Stubs:
 # - allow_command(cmd), expect_command(cmd): expect the exact command
-# - allow_script(script), expect_script(script): expect the script as <module>/path/to/file
+# - allow_script(script), expect_script(script): expect the script as <module>/path/to/file or an absolute path
 # - allow_task(task), expect_task(task): expect the named task
 # - allow_download(file), expect_download(file): expect the identified source file
-# - allow_upload(file), expect_upload(file): expect the identified source file
+# - allow_upload(file), expect_upload(file): expect the source file as <module>/path/to/file or an absolute path
 # - allow_out_message, expect_out_message: expect a message to be passed to out::message (only modifiers are
 #   be_called_times(n), with_params(params), and not_be_called)
 #
+# Files with absolute path (for upload and script) must exist or those functions will fail.
+#
 # Stub modifiers:
 # - be_called_times(n): if allowed, fail if the action is called more than 'n' times
 #                       if expected, fail unless the action is called 'n' times
@@ -154,7 +156,7 @@ module BoltSpec
     end
 
     def plugins
-      @plugins ||= Bolt::Plugin.setup(config, pal)
+      @plugins ||= Bolt::Plugin.new(config, pal)
     end
 
     def pal
@@ -211,8 +213,8 @@ module BoltSpec
     # def allow_script(script_name)
     #
     # file uploads and downloads have a single destination and no arguments
-    # def allow_file_upload(source_name)
-    # def allow_file_download(source_name)
+    # def allow_upload(source_name)
+    # def allow_download(source_name)
     #
     # Most of the information in commands is in the command string itself
     # we may need more flexible allows than just the name/command string

data/lib/bolt_spec/plans/mock_executor.rb

@@ -44,7 +44,7 @@ module BoltSpec
 
       def module_file_id(file)
         modpath = @modulepath.select { |path| file =~ /^#{path}/ }
-        raise "Could not identify modulepath containing #{file}: #{modpath}" unless modpath.size == 1
+        return nil unless modpath.size == 1
 
         path = Pathname.new(file)
         relative = path.relative_path_from(Pathname.new(modpath.first))
@@ -66,7 +66,7 @@ module BoltSpec
       end
 
       def run_script(targets, script_path, arguments, options = {}, _position = [])
-        script = module_file_id(script_path)
+        script = module_file_id(script_path) || script_path
         result = nil
         if (doub = @script_doubles[script] || @script_doubles[:default])
           result = doub.process(targets, script, arguments, options)
@@ -116,7 +116,7 @@ module BoltSpec
       end
 
       def upload_file(targets, source_path, destination, options = {}, _position = [])
-        source = module_file_id(source_path)
+        source = module_file_id(source_path) || source_path
         result = nil
         if (doub = @upload_doubles[source] || @upload_doubles[:default])
           result = doub.process(targets, source, destination, options)

data/lib/bolt_spec/run.rb

@@ -171,7 +171,7 @@ module BoltSpec
       end
 
       def plugins
-        @plugins ||= Bolt::Plugin.setup(config, pal)
+        @plugins ||= Bolt::Plugin.new(config, pal)
       end
 
       def puppetdb_client

data/libexec/bolt_catalog

@@ -59,7 +59,7 @@ when "compile"
     puts({ message: message, backtrace: e.backtrace }.to_json)
     exit 1
   rescue StandardError => e
-    puts({ message: e.message }.to_json)
+    puts({ message: e.message, backtrace: e.backtrace }.to_json)
     exit 1
   end
 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.18.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: ruby_smb
   requirement: !ruby/object:Gem::Requirement
@@ -477,6 +477,7 @@ files:
 - guides/transports.yaml
 - lib/bolt.rb
 - lib/bolt/analytics.rb
+- lib/bolt/application.rb
 - lib/bolt/applicator.rb
 - lib/bolt/apply_inventory.rb
 - lib/bolt/apply_result.rb
@@ -570,7 +571,6 @@ files:
 - lib/bolt/resource_instance.rb
 - lib/bolt/result.rb
 - lib/bolt/result_set.rb
-- lib/bolt/secret.rb
 - lib/bolt/shell.rb
 - lib/bolt/shell/bash.rb
 - lib/bolt/shell/bash/tmpdir.rb
@@ -610,6 +610,8 @@ files:
 - lib/bolt_server/plugin.rb
 - lib/bolt_server/plugin/puppet_connect_data.rb
 - lib/bolt_server/request_error.rb
+- lib/bolt_server/schemas/action-apply.json
+- lib/bolt_server/schemas/action-apply_prep.json
 - lib/bolt_server/schemas/action-check_node_connections.json
 - lib/bolt_server/schemas/action-run_command.json
 - lib/bolt_server/schemas/action-run_script.json

data/lib/bolt/secret.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'bolt/plugin'
-
-module Bolt
-  class Secret
-    KNOWN_KEYS = {
-      'createkeys' => %w[keysize private_key public_key],
-      'encrypt'    => %w[public_key],
-      'decrypt'    => %w[private_key public_key]
-    }.freeze
-
-    def self.execute(plugins, outputter, options)
-      name   = options[:plugin] || 'pkcs7'
-      plugin = plugins.by_name(name)
-
-      unless plugin
-        raise Bolt::Plugin::PluginError::Unknown, name
-      end
-
-      case options[:action]
-      when 'createkeys'
-        opts = { 'force' => options[:force] }.compact
-        result = plugins.get_hook(name, :secret_createkeys).call(opts)
-        outputter.print_message(result)
-      when 'encrypt'
-        encrypted = plugins.get_hook(name, :secret_encrypt).call('plaintext_value' => options[:object])
-        outputter.print_message(encrypted)
-      when 'decrypt'
-        decrypted = plugins.get_hook(name, :secret_decrypt).call('encrypted_value' => options[:object])
-        outputter.print_message(decrypted)
-      end
-
-      0
-    end
-  end
-end