bolt 3.15.0 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53659858c8aae545c73cd8ef74ce2fda41c024d0040cf2c1dc935985d28d53e3
-  data.tar.gz: 59909ae1b57566430f66f472e453ab16341ca530b2ac3b1036a4deefd269564e
+  metadata.gz: 1da7c437e5ea72a7f457ee51a06dbe434c85099ac2313491fffc63caa19b5acb
+  data.tar.gz: 5c081782bc847bf233e21a40094ffb0878e3bf0bf2da9ffd4ab527f1239d587e
 SHA512:
-  metadata.gz: 6e76fe56e10409ce22d1a849adf3bbbce19c838dfbb6cb3bb8461f7a642c150a9a17beac13a08f4273ebcbf781ee0d63dd3db6b7a034a2f15d9f300a94a8a16d
-  data.tar.gz: c109c02ee6fb38a0ffae8abc57709d60952c8a158edb45774344ae44df3a3d6689385924eddaefea40ed437ab7d73455d8aebf2a59c81ff7c7bce5651abdde68
+  metadata.gz: f1cf5097a426a55de0e69f62cb266b15a91521991ad777d8b21ce81653b828bc279d6111fc0d02fb2f289dc53170db0d13bc99580fcd73fab4ce67ac64751795
+  data.tar.gz: 0fef7a9159cc63e167a9014d25a4a1937194adcbcf35492f5286d1c0c88b9202436b1fe64ea92770895350c795900e3ed701a108bfb1814570386c6411079f00

data/Puppetfile

@@ -5,8 +5,8 @@ forge "http://forge.puppetlabs.com"
 moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
-mod 'puppetlabs-service', '2.0.0'
-mod 'puppetlabs-puppet_agent', '4.8.0'
+mod 'puppetlabs-service', '2.1.0'
+mod 'puppetlabs-puppet_agent', '4.9.0'
 mod 'puppetlabs-facts', '1.4.0'
 
 # Core types and providers for Puppet 6
@@ -22,20 +22,20 @@ mod 'puppetlabs-yumrepo_core', '1.0.7'
 mod 'puppetlabs-zone_core', '1.0.3'
 
 # Useful additional modules
-mod 'puppetlabs-package', '2.0.0'
+mod 'puppetlabs-package', '2.1.0'
 mod 'puppetlabs-powershell_task_helper', '0.1.0'
-mod 'puppetlabs-puppet_conf', '1.1.0'
+mod 'puppetlabs-puppet_conf', '1.2.0'
 mod 'puppetlabs-python_task_helper', '0.5.0'
-mod 'puppetlabs-reboot', '4.0.2'
+mod 'puppetlabs-reboot', '4.1.0'
 mod 'puppetlabs-ruby_task_helper', '0.6.0'
 mod 'puppetlabs-ruby_plugin_helper', '0.2.0'
-mod 'puppetlabs-stdlib', '7.1.0'
+mod 'puppetlabs-stdlib', '8.0.0'
 
 # Plugin modules
 mod 'puppetlabs-aws_inventory', '0.7.0'
 mod 'puppetlabs-azure_inventory', '0.5.0'
 mod 'puppetlabs-gcloud_inventory', '0.3.0'
-mod 'puppetlabs-http_request', '0.3.0'
+mod 'puppetlabs-http_request', '0.3.1'
 mod 'puppetlabs-pkcs7', '0.1.2'
 mod 'puppetlabs-secure_env_vars', '0.2.0'
 mod 'puppetlabs-terraform', '0.6.1'

data/bolt-modules/boltlib/lib/puppet/functions/run_script.rb

@@ -108,11 +108,8 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
     # Send Analytics Report
     executor.report_function_call(self.class.name)
 
-    future = executor&.future || {}
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(script, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(script, scope)
     unless found && Puppet::FileSystem.exist?(found)
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: script

data/bolt-modules/boltlib/lib/puppet/functions/upload_file.rb

@@ -70,11 +70,8 @@ Puppet::Functions.create_function(:upload_file, Puppet::Functions::InternalFunct
     # Send Analytics Report
     executor.report_function_call(self.class.name)
 
-    future = executor&.future || {}
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(source, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(source, scope)
     unless found && Puppet::FileSystem.exist?(found)
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: source

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

@@ -21,11 +21,8 @@ Puppet::Functions.create_function(:'file::exists', Puppet::Functions::InternalFu
     executor = Puppet.lookup(:bolt_executor) {}
     executor&.report_function_call(self.class.name)
 
-    future = executor&.future || Puppet.lookup(:future) { {} }
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(filename, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(filename, scope)
     found ? Puppet::FileSystem.exist?(found) : false
   end
 end

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

@@ -20,11 +20,8 @@ Puppet::Functions.create_function(:'file::read', Puppet::Functions::InternalFunc
     executor = Puppet.lookup(:bolt_executor) {}
     executor&.report_function_call(self.class.name)
 
-    future = executor&.future || Puppet.lookup(:future) { {} }
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(filename, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(filename, scope)
     unless found && Puppet::FileSystem.exist?(found)
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: filename

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

@@ -21,11 +21,8 @@ Puppet::Functions.create_function(:'file::readable', Puppet::Functions::Internal
     executor = Puppet.lookup(:bolt_executor) {}
     executor&.report_function_call(self.class.name)
 
-    future = executor&.future || Puppet.lookup(:future) { {} }
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(filename, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(filename, scope)
     found ? File.readable?(found) : false
   end
 end

data/lib/bolt/analytics.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/util'
-require 'bolt/version'
+require_relative '../bolt/util'
+require_relative '../bolt/version'
 require 'find'
 require 'json'
 require 'logging'
@@ -30,7 +30,6 @@ module Bolt
     }.freeze
 
     def self.build_client(enabled = true)
-      logger = Bolt::Logger.logger(self)
       begin
         config_file = config_path
         config = enabled ? load_config(config_file) : {}
@@ -39,7 +38,7 @@ module Bolt
       end
 
       if !enabled || config['disabled'] || ENV['BOLT_DISABLE_ANALYTICS']
-        logger.debug "Analytics opt-out is set, analytics will be disabled"
+        Bolt::Logger.debug "Analytics opt-out is set, analytics will be disabled"
         NoopClient.new
       else
         unless config.key?('user-id')
@@ -50,7 +49,7 @@ module Bolt
         Client.new(config['user-id'])
       end
     rescue StandardError => e
-      logger.debug "Failed to initialize analytics client, analytics will be disabled: #{e}"
+      Bolt::Logger.debug "Failed to initialize analytics client, analytics will be disabled: #{e}"
       NoopClient.new
     end
 
@@ -139,18 +138,6 @@ module Bolt
         end
       end
 
-      def plan_counts(plans_path)
-        pp_count, yaml_count = if File.exist?(plans_path)
-                                 %w[pp yaml].map do |extension|
-                                   Find.find(plans_path.to_s).grep(/.*\.#{extension}/).length
-                                 end
-                               else
-                                 [0, 0]
-                               end
-
-        { puppet_plan_count: pp_count, yaml_plan_count: yaml_count }
-      end
-
       def event(category, action, label: nil, value: nil, **kwargs)
         custom_dimensions = Bolt::Util.walk_keys(kwargs) do |k|
           CUSTOM_DIMENSIONS[k] || raise("Unknown analytics key '#{k}'")
@@ -236,10 +223,6 @@ module Bolt
 
       def report_bundled_content(mode, name); end
 
-      def plan_counts(_)
-        {}
-      end
-
       def event(category, action, **_kwargs)
         @logger.trace "Skipping submission of '#{category} #{action}' event because analytics is disabled"
       end