bolt 1.14.0 → 1.15.0

data/lib/bolt/transport/ssh/connection.rb

@@ -76,15 +76,7 @@ module Bolt
           @transport_logger = transport_logger
         end
 
-        if Bolt::Util.windows?
-          require 'ffi'
-          module Win
-            extend FFI::Library
-            ffi_lib 'user32'
-            ffi_convention :stdcall
-            attach_function :FindWindow, :FindWindowW, %i[buffer_in buffer_in], :int
-          end
-        end
+        PAGEANT_NAME = "Pageant\0".encode(Encoding::UTF_16LE)
 
         def connect
           options = {
@@ -119,6 +111,11 @@ module Bolt
 
           options[:proxy] = Net::SSH::Proxy::Jump.new(target.options['proxyjump']) if target.options['proxyjump']
 
+          # This option was to address discrepency betwen net-ssh host-key-check and ssh(1)
+          # For the net-ssh 5.x series it defaults to true, in 6.x it will default to false, and will be removed in 7.x
+          # https://github.com/net-ssh/net-ssh/pull/663#issuecomment-469979931
+          options[:check_host_ip] = false if Net::SSH::VALID_OPTIONS.include?(:check_host_ip)
+
           if @load_config
             # Mirroring:
             # https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/agent.rb#L80
@@ -129,8 +126,10 @@ module Bolt
                 options[:use_agent] = false
               end
             elsif Bolt::Util.windows?
-              pageant_wide = 'Pageant'.encode('UTF-16LE')
-              if Win.FindWindow(pageant_wide, pageant_wide).to_i == 0
+              require 'Win32API' # case matters in this require!
+              # https://docs.microsoft.com/en-us/windows/desktop/api/winuser/nf-winuser-findwindoww
+              @find_window ||= Win32API.new('user32', 'FindWindowW', %w[P P], 'L')
+              if @find_window.call(nil, PAGEANT_NAME).to_i == 0
                 @logger.debug { "Disabling use_agent in net-ssh: pageant process not running" }
                 options[:use_agent] = false
               end

data/lib/bolt/transport/winrm.rb

@@ -85,7 +85,11 @@ module Bolt
       def run_command(target, command, _options = {})
         with_connection(target) do |conn|
           output = conn.execute(command)
-          Bolt::Result.for_command(target, output.stdout.string, output.stderr.string, output.exit_code)
+          Bolt::Result.for_command(target,
+                                   output.stdout.string,
+                                   output.stderr.string,
+                                   output.exit_code,
+                                   'command', command)
         end
       end
 
@@ -102,7 +106,11 @@ module Bolt
               args += Powershell.escape_arguments(arguments)
               output = conn.execute_process(path, args)
             end
-            Bolt::Result.for_command(target, output.stdout.string, output.stderr.string, output.exit_code)
+            Bolt::Result.for_command(target,
+                                     output.stdout.string,
+                                     output.stderr.string,
+                                     output.exit_code,
+                                     'script', script)
           end
         end
       end
@@ -163,7 +171,8 @@ module Bolt
 
             Bolt::Result.for_task(target, output.stdout.string,
                                   output.stderr.string,
-                                  output.exit_code)
+                                  output.exit_code,
+                                  task.name)
           end
         end
       end

data/lib/bolt/transport/winrm/connection.rb

@@ -2,7 +2,6 @@
 
 require 'bolt/node/errors'
 require 'bolt/node/output'
-require 'ruby_smb'
 
 module Bolt
   module Transport
@@ -158,6 +157,9 @@ module Bolt
         end
 
         def write_remote_file_smb(source, destination)
+          # lazy-load expensive gem code
+          require 'ruby_smb'
+
           win_dest = destination.tr('/', '\\')
           if (md = win_dest.match(/^([a-z]):\\(.*)/i))
             # if drive, use admin share for that drive, so path is '\\host\C$'

data/lib/bolt/version.rb

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

data/lib/bolt_server/file_cache.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-require 'concurrent'
+require 'concurrent/atomic/read_write_lock'
+require 'concurrent/executor/single_thread_executor'
+require 'concurrent/promise'
+require 'concurrent/timer_task'
 require 'digest'
 require 'fileutils'
 require 'net/http'

data/lib/bolt_server/transport_app.rb

@@ -4,8 +4,8 @@ require 'sinatra'
 require 'bolt'
 require 'bolt/error'
 require 'bolt/target'
-require 'bolt/task/puppet_server'
 require 'bolt_server/file_cache'
+require 'bolt/task/puppet_server'
 require 'json'
 require 'json-schema'
 

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

@@ -29,7 +29,7 @@ module BoltSpec
       end
 
       def result_for(target, stdout: '', stderr: '')
-        Bolt::Result.for_command(target, stdout, stderr, 0)
+        Bolt::Result.for_command(target, stdout, stderr, 0, 'command', '')
       end
 
       # Public methods

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

@@ -35,7 +35,7 @@ module BoltSpec
       end
 
       def result_for(target, stdout: '', stderr: '')
-        Bolt::Result.for_command(target, stdout, stderr, 0)
+        Bolt::Result.for_command(target, stdout, stderr, 0, 'script', '')
       end
 
       # Public methods

data/lib/bolt_spec/run.rb

@@ -12,6 +12,14 @@ require 'bolt/util'
 module BoltSpec
   module Run
     def run_task(task_name, targets, params, config: nil, inventory: nil)
+      if config.nil? && defined?(bolt_config)
+        config = bolt_config
+      end
+
+      if inventory.nil? && defined?(bolt_inventory)
+        inventory = bolt_inventory
+      end
+
       result = BoltRunner.with_runner(config, inventory) do |runner|
         runner.run_task(task_name, targets, params)
       end
@@ -20,6 +28,14 @@ module BoltSpec
     end
 
     def run_plan(plan_name, params, config: nil, inventory: nil)
+      if config.nil? && defined?(bolt_config)
+        config = bolt_config
+      end
+
+      if inventory.nil? && defined?(bolt_inventory)
+        inventory = bolt_inventory
+      end
+
       # Users copying code from run_task may forget that targets is not a parameter for run plan
       raise ArgumentError, "params must be a hash" unless params.is_a?(Hash)
 
@@ -32,6 +48,14 @@ module BoltSpec
     end
 
     def run_command(command, targets, options: {}, config: nil, inventory: nil)
+      if config.nil? && defined?(bolt_config)
+        config = bolt_config
+      end
+
+      if inventory.nil? && defined?(bolt_inventory)
+        inventory = bolt_inventory
+      end
+
       result = BoltRunner.with_runner(config, inventory) do |runner|
         runner.run_command(command, targets, options)
       end
@@ -40,6 +64,14 @@ module BoltSpec
     end
 
     def run_script(script, targets, arguments, options: {}, config: nil, inventory: nil)
+      if config.nil? && defined?(bolt_config)
+        config = bolt_config
+      end
+
+      if inventory.nil? && defined?(bolt_inventory)
+        inventory = bolt_inventory
+      end
+
       result = BoltRunner.with_runner(config, inventory) do |runner|
         runner.run_script(script, targets, arguments, options)
       end
@@ -47,7 +79,31 @@ module BoltSpec
       Bolt::Util.walk_keys(result, &:to_s)
     end
 
+    def upload_file(source, dest, targets, options: {}, config: nil, inventory: nil)
+      if config.nil? && defined?(bolt_config)
+        config = bolt_config
+      end
+
+      if inventory.nil? && defined?(bolt_inventory)
+        inventory = bolt_inventory
+      end
+
+      result = BoltRunner.with_runner(config, inventory) do |runner|
+        runner.upload_file(source, dest, targets, options)
+      end
+      result = result.to_a
+      Bolt::Util.walk_keys(result, &:to_s)
+    end
+
     def apply_manifest(manifest, targets, execute: false, noop: false, config: nil, inventory: nil)
+      if config.nil? && defined?(bolt_config)
+        config = bolt_config
+      end
+
+      if inventory.nil? && defined?(bolt_inventory)
+        inventory = bolt_inventory
+      end
+
       # The execute parameter is equivalent to the --execute option
       if execute
         code = manifest
@@ -127,6 +183,12 @@ module BoltSpec
         executor.run_script(targets, script, arguments, options)
       end
 
+      def upload_file(source, dest, targets, options = {})
+        executor = Bolt::Executor.new(config.concurrency, @analytics)
+        targets = inventory.get_targets(targets)
+        executor.upload_file(targets, source, dest, options)
+      end
+
       def apply_manifest(code, targets, filename = nil, noop = false)
         ast = pal.parse_manifest(code, filename)
         executor = Bolt::Executor.new(config.concurrency, @analytics, noop)

data/lib/plan_executor/app.rb

@@ -9,7 +9,6 @@ require 'bolt/puppetdb'
 require 'bolt/version'
 require 'plan_executor/applicator'
 require 'plan_executor/executor'
-require 'concurrent'
 require 'json'
 require 'json-schema'
 
@@ -28,6 +27,9 @@ module PlanExecutor
     end
 
     def initialize(config)
+      # lazy-load expensive gem code
+      require 'concurrent'
+
       @http_client = create_http(config)
 
       # Use an empty inventory until we figure out where this data comes from.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -152,7 +152,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -361,6 +361,9 @@ files:
 - lib/bolt/pal.rb
 - lib/bolt/pal/issues.rb
 - lib/bolt/pal/logging.rb
+- lib/bolt/pal/yaml_plan.rb
+- lib/bolt/pal/yaml_plan/evaluator.rb
+- lib/bolt/pal/yaml_plan/loader.rb
 - lib/bolt/plan_result.rb
 - lib/bolt/puppetdb.rb
 - lib/bolt/puppetdb/client.rb
@@ -371,7 +374,6 @@ files:
 - lib/bolt/target.rb
 - lib/bolt/task.rb
 - lib/bolt/task/puppet_server.rb
-- lib/bolt/task/remote.rb
 - lib/bolt/transport/base.rb
 - lib/bolt/transport/docker.rb
 - lib/bolt/transport/docker/connection.rb

data/lib/bolt/task/remote.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'bolt/task'
-
-module Bolt
-  class Task
-    class Remote < Task
-      def self.from_task(task)
-        new(task.name, task.file, task.files, task.metadata)
-      end
-
-      def implementations
-        metadata['implementations']&.select { |i| i['remote'] || metadata['remote'] }
-      end
-
-      def select_implementation(target, *args)
-        unless implementations || metadata['remote']
-          raise NoImplementationError.new(target, self)
-        end
-
-        super(target, *args)
-      end
-    end
-  end
-end