bolt 2.11.0 → 2.15.0

data/lib/bolt/resource_instance.rb

@@ -30,8 +30,7 @@ module Bolt
       @target        = resource_hash['target']
       @type          = resource_hash['type'].to_s.capitalize
       @title         = resource_hash['title']
-      # get_resources() returns observed state under the 'parameters' key
-      @state         = resource_hash['state'] || resource_hash['parameters'] || {}
+      @state         = resource_hash['state'] || {}
       @desired_state = resource_hash['desired_state'] || {}
       @events        = resource_hash['events'] || []
     end
@@ -84,11 +83,19 @@ module Bolt
       to_hash.to_json(opts)
     end
 
+    def self.format_reference(type, title)
+      "#{type.capitalize}[#{title}]"
+    end
+
     def reference
-      "#{type}[#{title}]"
+      self.class.format_reference(@type, @title)
     end
     alias to_s reference
 
+    def [](attribute)
+      @state[attribute]
+    end
+
     def add_event(event)
       @events << event
     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}

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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '2.11.0'
+  VERSION = '2.15.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.11.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -178,13 +178,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.15.0
+        version: 6.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -194,7 +208,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.15.0
+        version: 6.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -407,6 +421,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
@@ -466,6 +481,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 +604,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