bolt 2.13.0 → 2.18.0

data/lib/bolt/shell/powershell.rb

@@ -71,8 +71,10 @@ module Bolt
         end
       end
 
-      def set_env(arg, val)
-        "[Environment]::SetEnvironmentVariable('#{arg}', @'\n#{val}\n'@)"
+      def env_declarations(env_vars)
+        env_vars.map do |var, val|
+          "[Environment]::SetEnvironmentVariable('#{var}', @'\n#{val}\n'@)"
+        end
       end
 
       def quote_string(string)
@@ -111,7 +113,8 @@ module Bolt
       end
 
       def mkdirs(dirs)
-        mkdir_command = "mkdir -Force #{dirs.uniq.sort.join(',')}"
+        paths = dirs.uniq.sort.join('","')
+        mkdir_command = "mkdir -Force -Path (\"#{paths}\")"
         result = execute(mkdir_command)
         if result.exit_code != 0
           message = "Could not create directories: #{result.stderr.string}"
@@ -165,7 +168,9 @@ module Bolt
         Bolt::Result.for_upload(target, source, destination)
       end
 
-      def run_command(command, _options = {})
+      def run_command(command, options = {})
+        command = [*env_declarations(options[:env_vars]), command].join("\r\n") if options[:env_vars]
+
         output = execute(command)
         Bolt::Result.for_command(target,
                                  output.stdout.string,
@@ -174,7 +179,7 @@ module Bolt
                                  'command', command)
       end
 
-      def run_script(script, arguments, _options = {})
+      def run_script(script, arguments, options = {})
         # unpack any Sensitive data
         arguments = unwrap_sensitive_args(arguments)
         with_tmpdir do |dir|
@@ -186,6 +191,8 @@ module Bolt
                       args += escape_arguments(arguments)
                       execute_process(path, args)
                     end
+          command = [*env_declarations(options[:env_vars]), command].join("\r\n") if options[:env_vars]
+
           output = execute(command)
           Bolt::Result.for_command(target,
                                    output.stdout.string,
@@ -236,9 +243,7 @@ module Bolt
                     end
 
           env_assignments = if Bolt::Task::ENVIRONMENT_METHODS.include?(input_method)
-                              envify_params(arguments).map do |(arg, val)|
-                                set_env(arg, val)
-                              end
+                              env_declarations(envify_params(arguments))
                             else
                               []
                             end

data/lib/bolt/shell/powershell/snippets.rb

@@ -20,6 +20,14 @@ module Bolt
             PS
           end
 
+          def exit_with_code(command)
+            <<~PS
+            #{command}
+            if (-not $? -and ($LASTEXITCODE -eq $null)) { exit 1 }
+            exit $LASTEXITCODE
+            PS
+          end
+
           def make_tmpdir(parent)
             <<~PS
             $parent = #{parent}
@@ -77,12 +85,21 @@ module Bolt
 
           def shell_init
             <<~PS
-            $ENV:PATH += ";${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\bin\\;" +
-            "${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\puppet\\bin;" +
-            "${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\sys\\ruby\\bin\\"
-            $ENV:RUBYLIB = "${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\puppet\\lib;" +
-            "${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\facter\\lib;" +
-            "${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\hiera\\lib;" +
+            $installRegKey = Get-ItemProperty -Path "HKLM:\\Software\\Puppet Labs\\Puppet" -ErrorAction 0
+            if(![string]::IsNullOrEmpty($installRegKey.RememberedInstallDir64)){
+              $boltBaseDir = $installRegKey.RememberedInstallDir64
+            }elseif(![string]::IsNullOrEmpty($installRegKey.RememberedInstallDir)){
+              $boltBaseDir = $installRegKey.RememberedInstallDir
+            }else{
+              $boltBaseDir = "${ENV:ProgramFiles}\\Puppet Labs\\Puppet"
+            }
+
+            $ENV:PATH += ";${boltBaseDir}\\bin\\;" +
+            "${boltBaseDir}\\puppet\\bin;" +
+            "${boltBaseDir}\\sys\\ruby\\bin\\"
+            $ENV:RUBYLIB = "${boltBaseDir}\\puppet\\lib;" +
+            "${boltBaseDir}\\facter\\lib;" +
+            "${boltBaseDir}\\hiera\\lib;" +
             $ENV:RUBYLIB
 
             Add-Type -AssemblyName System.ServiceModel.Web, System.Runtime.Serialization

data/lib/bolt/transport/docker.rb

@@ -20,7 +20,7 @@ module Bolt
       def upload(target, source, destination, _options = {})
         with_connection(target) do |conn|
           conn.with_remote_tmpdir do |dir|
-            basename = File.basename(destination)
+            basename = File.basename(source)
             tmpfile = "#{dir}/#{basename}"
             if File.directory?(source)
               conn.write_remote_directory(source, tmpfile)
@@ -39,7 +39,9 @@ module Bolt
       end
 
       def run_command(target, command, options = {})
-        options[:tty] = target.options['tty']
+        execute_options = {}
+        execute_options[:tty] = target.options['tty']
+        execute_options[:environment] = options[:env_vars]
 
         if target.options['shell-command'] && !target.options['shell-command'].empty?
           # escape any double quotes in command
@@ -47,19 +49,21 @@ module Bolt
           command = "#{target.options['shell-command']} \" #{command}\""
         end
         with_connection(target) do |conn|
-          stdout, stderr, exitcode = conn.execute(*Shellwords.split(command), options)
+          stdout, stderr, exitcode = conn.execute(*Shellwords.split(command), execute_options)
           Bolt::Result.for_command(target, stdout, stderr, exitcode, 'command', command)
         end
       end
 
-      def run_script(target, script, arguments, _options = {})
+      def run_script(target, script, arguments, options = {})
         # unpack any Sensitive data
         arguments = unwrap_sensitive_args(arguments)
+        execute_options = {}
+        execute_options[:environment] = options[:env_vars]
 
         with_connection(target) do |conn|
           conn.with_remote_tmpdir do |dir|
             remote_path = conn.write_remote_executable(dir, script)
-            stdout, stderr, exitcode = conn.execute(remote_path, *arguments, {})
+            stdout, stderr, exitcode = conn.execute(remote_path, *arguments, execute_options)
             Bolt::Result.for_command(target, stdout, stderr, exitcode, 'script', script)
           end
         end

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

@@ -50,7 +50,8 @@ module Bolt
             # If it's already a powershell command then invoke it normally.
             # Otherwise, wrap it in powershell.exe.
             unless command.start_with?('powershell.exe')
-              command = ['powershell.exe', *Bolt::Shell::Powershell::PS_ARGS, '-Command', command]
+              cmd = Bolt::Shell::Powershell::Snippets.exit_with_code(command)
+              command = ['powershell.exe', *Bolt::Shell::Powershell::PS_ARGS, '-Command', cmd]
             end
           end
 

data/lib/bolt/transport/orch.rb

@@ -82,6 +82,10 @@ module Bolt
       end
 
       def batch_command(targets, command, options = {}, &callback)
+        if options[:env_vars] && !options[:env_vars].empty?
+          raise NotImplementedError, "pcp transport does not support setting environment variables"
+        end
+
         params = {
           'command' => command
         }
@@ -98,6 +102,10 @@ module Bolt
       end
 
       def batch_script(targets, script, arguments, options = {}, &callback)
+        if options[:env_vars] && !options[:env_vars].empty?
+          raise NotImplementedError, "pcp transport does not support setting environment variables"
+        end
+
         content = File.open(script, &:read)
         content = Base64.encode64(content)
         params = {

data/lib/bolt/transport/ssh.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bolt/logger'
 require 'bolt/node/errors'
 require 'bolt/transport/simple'
 
@@ -21,7 +22,12 @@ module Bolt
       end
 
       def with_connection(target)
-        conn = if target.transport_config['ssh-command']
+        if target.transport_config['ssh-command'] && !target.transport_config['native-ssh']
+          Bolt::Logger.warn_once("ssh-command and native-ssh conflict",
+                                 "native-ssh must be true to use ssh-command")
+        end
+
+        conn = if target.transport_config['native-ssh']
                  ExecConnection.new(target)
                else
                  Connection.new(target, @transport_logger)

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

@@ -78,6 +78,28 @@ module Bolt
 
           options[:proxy] = Net::SSH::Proxy::Jump.new(target.options['proxyjump']) if target.options['proxyjump']
 
+          # Override the default supported algorithms for net-ssh. By default, a subset of supported algorithms
+          # are enabled in 6.x, while several are deprecated and not enabled by default. The *-algorithms
+          # options can be used to specify a list of algorithms to enable in net-ssh. Any algorithms not in the
+          # list are disabled, including ones that are normally enabled by default. Support for deprecated
+          # algorithms will be removed in 7.x.
+          # https://github.com/net-ssh/net-ssh#supported-algorithms
+          if target.options['encryption-algorithms']
+            options[:encryption] = net_ssh_algorithms(:encryption, target.options['encryption-algorithms'])
+          end
+
+          if target.options['host-key-algorithms']
+            options[:host_key] = net_ssh_algorithms(:host_key, target.options['host-key-algorithms'])
+          end
+
+          if target.options['kex-algorithms']
+            options[:kex] = net_ssh_algorithms(:kex, target.options['kex-algorithms'])
+          end
+
+          if target.options['mac-algorithms']
+            options[:hmac] = net_ssh_algorithms(:hmac, target.options['mac-algorithms'])
+          end
+
           # 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
@@ -246,6 +268,19 @@ module Bolt
           end
         end
 
+        # Add all default algorithms if the 'defaults' key is present and filter
+        # out any unsupported algorithms.
+        def net_ssh_algorithms(type, algorithms)
+          if algorithms.include?('defaults')
+            defaults = Net::SSH::Transport::Algorithms::DEFAULT_ALGORITHMS[type]
+            algorithms += defaults
+          end
+
+          known = Net::SSH::Transport::Algorithms::ALGORITHMS[type]
+
+          algorithms & known
+        end
+
         def shell
           @shell ||= if target.options['login-shell'] == 'powershell'
                        Bolt::Shell::Powershell.new(target, self)

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

@@ -58,7 +58,7 @@ module Bolt
         end
 
         def build_ssh_command(command)
-          ssh_conf = @target.transport_config['ssh-command']
+          ssh_conf = @target.transport_config['ssh-command'] || 'ssh'
           ssh_cmd = Array(ssh_conf)
           ssh_cmd += ssh_opts
           ssh_cmd << userhost

data/lib/bolt/version.rb

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

data/lib/bolt_spec/bolt_context.rb

@@ -138,7 +138,7 @@ module BoltSpec
     # Override in your tests
     def config
       @config ||= begin
-                    conf = Bolt::Config.new(Bolt::Project.new('.'), {})
+                    conf = Bolt::Config.default
                     conf.modulepath = [modulepath].flatten
                     conf
                   end

data/lib/bolt_spec/run.rb

@@ -144,7 +144,7 @@ module BoltSpec
       end
 
       def config
-        @config ||= Bolt::Config.new(Bolt::Project.new(@project_path), @config_data)
+        @config ||= Bolt::Config.new(Bolt::Project.create_project(@project_path), @config_data)
       end
 
       def inventory

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -184,7 +184,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.15.0
+        version: 6.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -194,52 +194,52 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.15.0
+        version: 6.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
-  name: puppet-resource_api
+  name: puppetfile-resolver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: puppet-strings
+  name: puppet-resource_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: puppetfile-resolver
+  name: puppet-strings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
@@ -407,6 +407,7 @@ files:
 - bolt-modules/boltlib/lib/puppet/functions/puppetdb_query.rb
 - bolt-modules/boltlib/lib/puppet/functions/remove_from_group.rb
 - bolt-modules/boltlib/lib/puppet/functions/resolve_references.rb
+- bolt-modules/boltlib/lib/puppet/functions/resource.rb
 - bolt-modules/boltlib/lib/puppet/functions/run_command.rb
 - bolt-modules/boltlib/lib/puppet/functions/run_plan.rb
 - bolt-modules/boltlib/lib/puppet/functions/run_script.rb
@@ -445,9 +446,11 @@ files:
 - lib/bolt/catalog/logging.rb
 - lib/bolt/cli.rb
 - lib/bolt/config.rb
+- lib/bolt/config/options.rb
 - lib/bolt/config/transport/base.rb
 - lib/bolt/config/transport/docker.rb
 - lib/bolt/config/transport/local.rb
+- lib/bolt/config/transport/options.rb
 - lib/bolt/config/transport/orch.rb
 - lib/bolt/config/transport/remote.rb
 - lib/bolt/config/transport/ssh.rb
@@ -466,6 +469,7 @@ files:
 - lib/bolt/outputter/human.rb
 - lib/bolt/outputter/json.rb
 - lib/bolt/outputter/logger.rb
+- lib/bolt/outputter/rainbow.rb
 - lib/bolt/pal.rb
 - lib/bolt/pal/issues.rb
 - lib/bolt/pal/logging.rb
@@ -588,7 +592,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Execute commands remotely over SSH and WinRM