bolt 3.28.0 → 3.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3486ecf4bb0040b777bc1a583502a8acc274d9372f2d0d0ca2d30dd79e2a4cf2
-  data.tar.gz: cba32d061afa5a5131ba6fb258ad6e99d1374d5f9ffa5c5bd440e6bdb927a01d
+  metadata.gz: 6b5a8936e9789e8d1a722b5cc76cedf594a8f09709352b95ed6e423f0d7ddc6e
+  data.tar.gz: ef052d1f831ba328d6949a1f33ec617f933f2f28e862d23264ed1dfd9b43b0a6
 SHA512:
-  metadata.gz: 5d6c00d0f3f0d2eef45f0773241f899d733e5c7aab7cefa49f697f8840045487cc25fc0ea327b879a4dfae740cc1dafa94e161e50333703145ef9539dd944e0f
-  data.tar.gz: a18624b8307013c01e11d3601e5d26e894245ff844f359d799021774c8fa30341bebefe291207922971c4559580ad576d342c56b8f2d3a1516a3b6fb6ccf85e5
+  metadata.gz: f1eeec5f42a0f82a751d5eaa834a42e66d26080a0250e680d4c6328e7fb3a2048f13093d65dc6a7d55220963d8178cbaee7744643f17dd82af44d92b3187c3a6
+  data.tar.gz: 6cd501114d6efc60a26df945e528b03a610018c287a9e03b722f15da5a37680655df1dc953702922e0c306376adcb9e536b30f6aedb1b24a4efe9e97fc3da504

data/Puppetfile

@@ -5,27 +5,27 @@ forge 'https://forge.puppetlabs.com'
 moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
-mod 'puppetlabs-service', '2.2.0'
-mod 'puppetlabs-puppet_agent', '4.12.1'
+mod 'puppetlabs-service', '3.0.0'
+mod 'puppetlabs-puppet_agent', '4.19.0'
 mod 'puppetlabs-facts', '1.4.0'
 
 # Core types and providers for Puppet 6
-mod 'puppetlabs-augeas_core', '1.2.0'
-mod 'puppetlabs-host_core', '1.1.0'
-mod 'puppetlabs-scheduled_task', '3.1.0'
-mod 'puppetlabs-sshkeys_core', '2.3.0'
-mod 'puppetlabs-zfs_core', '1.3.0'
-mod 'puppetlabs-cron_core', '1.1.0'
-mod 'puppetlabs-mount_core', '1.1.0'
-mod 'puppetlabs-selinux_core', '1.2.0'
-mod 'puppetlabs-yumrepo_core', '1.1.0'
-mod 'puppetlabs-zone_core', '1.0.3'
+mod 'puppetlabs-augeas_core', '1.5.0'
+mod 'puppetlabs-host_core', '1.3.0'
+mod 'puppetlabs-scheduled_task', '4.0.0'
+mod 'puppetlabs-sshkeys_core', '2.5.0'
+mod 'puppetlabs-zfs_core', '1.5.0'
+mod 'puppetlabs-cron_core', '1.3.0'
+mod 'puppetlabs-mount_core', '1.3.0'
+mod 'puppetlabs-selinux_core', '1.4.0'
+mod 'puppetlabs-yumrepo_core', '2.1.0'
+mod 'puppetlabs-zone_core', '1.2.0'
 
 # Useful additional modules
-mod 'puppetlabs-package', '2.2.0'
-mod 'puppetlabs-puppet_conf', '1.3.0'
-mod 'puppetlabs-reboot', '4.2.0'
-mod 'puppetlabs-stdlib', '8.4.0'
+mod 'puppetlabs-package', '3.0.1'
+mod 'puppetlabs-puppet_conf', '2.0.0'
+mod 'puppetlabs-reboot', '5.0.0'
+mod 'puppetlabs-stdlib', '9.6.0'
 
 # Task helpers
 mod 'puppetlabs-powershell_task_helper', '0.1.0'

data/bolt-modules/file/lib/puppet/functions/file/delete.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# Delete a file on localhost using ruby's `File.delete`. This will only delete
+# files on the machine you run Bolt on.
+Puppet::Functions.create_function(:'file::delete') do
+  # @param filename Absolute path.
+  # @example Delete a file from disk
+  #   file::delete('C:/Users/me/report')
+  dispatch :delete do
+    required_param 'String[1]', :filename
+    return_type 'Undef'
+  end
+
+  def delete(filename)
+    # Send Analytics Report
+    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
+
+    File.delete(filename)
+    nil
+  end
+end

data/lib/bolt/config.rb

@@ -169,7 +169,7 @@ module Bolt
       @config_files = []
 
       default_data = {
-        'analytics'           => true,
+        'analytics'           => false,
         'apply-settings'      => {},
         'color'               => true,
         'compile-concurrency' => Etc.nprocessors,

data/lib/bolt/inventory/target.rb

@@ -98,7 +98,7 @@ module Bolt
 
       def add_facts(new_facts = {})
         validate_fact_names(new_facts)
-        @facts = Bolt::Util.deep_merge(@facts, new_facts)
+        Bolt::Util.deep_merge!(@facts, new_facts)
       end
 
       def features

data/lib/bolt/puppetdb/config.rb

@@ -60,7 +60,7 @@ module Bolt
       end
 
       def token
-        return @token if @token
+        return @token if @token_computed
         # Allow nil in config to skip loading a token
         if @settings.include?('token')
           if @settings['token']
@@ -69,6 +69,12 @@ module Bolt
         elsif File.exist?(DEFAULT_TOKEN)
           @token = File.read(DEFAULT_TOKEN)
         end
+        # Only use cert based auth in the case token and cert are both configured
+        if @token && cert
+          Bolt::Logger.logger(self).debug("Both cert and token based auth configured, using cert only")
+          @token = nil
+        end
+        @token_computed = true
         @token = @token.strip if @token
       end
 

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

@@ -55,21 +55,25 @@ module Bolt
             }
             #{build_arg_list}
 
-            switch -regex ( Get-ExecutionPolicy )
+            try
             {
-              '^AllSigned'
+              switch -regex ( Get-ExecutionPolicy )
               {
-                if ((Get-AuthenticodeSignature -File "#{script_path}").Status -ne 'Valid') {
-                  $Host.UI.WriteErrorLine("Error: Target host Powershell ExecutionPolicy is set to ${_} and script '#{script_path}' does not contain a valid signature.")
+                '^AllSigned'
+                {
+                  if ((Get-AuthenticodeSignature -File "#{script_path}").Status -ne 'Valid') {
+                    $Host.UI.WriteErrorLine("Error: Target host Powershell ExecutionPolicy is set to ${_} and script '#{script_path}' does not contain a valid signature.")
+                    exit 1;
+                  }
+                }
+                '^Restricted'
+                {
+                  $Host.UI.WriteErrorLine("Error: Target host Powershell ExecutionPolicy is set to ${_} which denies running any scripts on the target.")
                   exit 1;
                 }
               }
-              '^Restricted'
-              {
-                $Host.UI.WriteErrorLine("Error: Target host Powershell ExecutionPolicy is set to ${_} which denies running any scripts on the target.")
-                exit 1;
-              }
             }
+            catch {}
 
             if([string]::IsNullOrEmpty($invokeArgs.ScriptBlock)){
               $Host.UI.WriteErrorLine("Error: Failed to obtain scriptblock from '#{script_path}'. Running scripts might be disabled on this system. For more information, see about_Execution_Policies at https:/go.microsoft.com/fwlink/?LinkID=135170");

data/lib/bolt/util.rb

@@ -212,6 +212,17 @@ module Bolt
         hash1.merge(hash2, &recursive_merge)
       end
 
+      def deep_merge!(hash1, hash2)
+        recursive_merge = proc do |_key, h1, h2|
+          if h1.is_a?(Hash) && h2.is_a?(Hash)
+            h1.merge!(h2, &recursive_merge)
+          else
+            h2
+          end
+        end
+        hash1.merge!(hash2, &recursive_merge)
+      end
+
       # Accepts a Data object and returns a copy with all hash keys
       # modified by block. use &:to_s to stringify keys or &:to_sym to symbolize them
       def walk_keys(data, &block)

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.28.0
+  version: 3.29.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -473,6 +473,7 @@ files:
 - bolt-modules/ctrl/lib/puppet/functions/ctrl/do_until.rb
 - bolt-modules/ctrl/lib/puppet/functions/ctrl/sleep.rb
 - bolt-modules/dir/lib/puppet/functions/dir/children.rb
+- bolt-modules/file/lib/puppet/functions/file/delete.rb
 - bolt-modules/file/lib/puppet/functions/file/exists.rb
 - bolt-modules/file/lib/puppet/functions/file/join.rb
 - bolt-modules/file/lib/puppet/functions/file/read.rb