bolt 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7cfabedc8ddc7e9d4f1345d676f959e08d6bf5f8
-  data.tar.gz: d05d6c279ff68b287402b6ea1439bec634b7caed
+SHA256:
+  metadata.gz: 19cf0dd944021e5b7255b245987961c4155b4ea9400e5d65ad384342fa094a0d
+  data.tar.gz: 3755fd0a3e63d7e28e82b08e255953c51b0b539ceb3e180a69930a6cdddc1eb2
 SHA512:
-  metadata.gz: 959a5345daf5570d015c8a4d1decde76e963840104467c56d7cc86b1322d7a06b59cecb3d2b38c3dd8acaef59950bfce8be8f2b92b752f491646e4738b3d22e0
-  data.tar.gz: 3d772b7542b144c6916d04ead84a310ff3484df651a11c9332b2548b177423b634dd371263002365a8ce6d93581b01ec7b116b72678499da1fb7989e1ed19710
+  metadata.gz: 84db88c85867ef1a27f4a726f2672ba1b78d453cec47f0f003326079c777b398039f5516e2c1f33697e7ac19e9d861b75d4767cb9512bf7e9bb8dbabe2ad19a1
+  data.tar.gz: 0b465783458691bbcb78f1f52eba1b4e7b04c2840e1c06ea24f6ddf4947d6daf5d664b21d4d77062d88eaeace4f224edb5bb1dfada97131fd0e1356d330b9846

data/lib/bolt/applicator.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'open3'
+
+module Bolt
+  Task = Struct.new(:name, :implementations, :input_method)
+
+  class Applicator
+    def initialize(inventory, executor)
+      @inventory = inventory
+      @executor = executor
+    end
+
+    def apply(args, apply_body, _scope)
+      raise(ArgumentError, 'apply requires a TargetSpec') if args.empty?
+      type0 = Puppet.lookup(:pal_script_compiler).type('TargetSpec')
+      Puppet::Pal.assert_type(type0, args[0], 'apply targets')
+
+      params = {}
+      if args.count > 1
+        type1 = Puppet.lookup(:pal_script_compiler).type('Hash[String, Data]')
+        Puppet::Pal.assert_type(type1, args[1], 'apply options')
+        params = args[1]
+      end
+
+      targets = @inventory.get_targets(args[0])
+      ast = Puppet::Pops::Serialization::ToDataConverter.convert(apply_body, rich_data: true, symbol_to_string: true)
+      results = targets.map do |target|
+        catalog_input = {
+          code_ast: ast,
+          modulepath: [],
+          target: {
+            name: target.host,
+            facts: @inventory.facts(target),
+            variables: @inventory.vars(target)
+          }
+        }
+
+        libexec = File.join(Gem::Specification.find_by_name('bolt').gem_dir, 'libexec')
+
+        bolt_catalog_exe = File.join(libexec, 'bolt_catalog')
+        out, err, stat = Open3.capture3(bolt_catalog_exe, 'compile', stdin_data: catalog_input.to_json)
+        raise ApplyError.new(target.to_s, err) unless stat.success?
+        catalog = JSON.parse(out)
+
+        path = File.join(libexec, 'apply_catalog.rb')
+        impl = { 'name' => 'apply_catalog.rb', 'path' => path, 'requirements' => [], 'supports_noop' => true }
+        task = Task.new('apply_catalog', [impl], 'stdin')
+        params['catalog'] = catalog
+        @executor.run_task([target], task, params, '_description' => 'apply catalog')
+      end
+      ResultSet.new results.reduce([]) { |result, result_set| result + result_set.results }
+    end
+  end
+end

data/lib/bolt/error.rb

@@ -77,6 +77,12 @@ module Bolt
     end
   end
 
+  class ApplyError < Error
+    def initialize(target, err)
+      super("Apply failed to compile for #{target}: #{err}", 'bolt/apply-error')
+    end
+  end
+
   class InvalidPlanResult < Error
     def initialize(plan_name, result_str)
       super("Plan #{plan_name} returned an invalid result: #{result_str}",

data/lib/bolt/pal.rb

@@ -4,6 +4,7 @@ require 'bolt/executor'
 require 'bolt/error'
 require 'bolt/plan_result'
 require 'bolt/util'
+require 'bolt/applicator'
 
 module Bolt
   class PAL
@@ -114,7 +115,13 @@ module Bolt
     end
 
     def with_bolt_executor(executor, inventory, pdb_client = nil, &block)
-      Puppet.override({ bolt_executor: executor, bolt_inventory: inventory, bolt_pdb_client: pdb_client }, &block)
+      opts = {
+        bolt_executor: executor,
+        bolt_inventory: inventory,
+        bolt_pdb_client: pdb_client,
+        apply_executor: Applicator.new(inventory, executor)
+      }
+      Puppet.override(opts, &block)
     end
 
     def in_plan_compiler(executor, inventory, pdb_client)

data/lib/bolt/transport/winrm.rb

@@ -128,9 +128,12 @@ catch
                 # fortunately, using PS with stdin input_method should never happen
                 if input_method == 'powershell'
                   conn.execute(<<-PS)
-$private:taskArgs = Get-ContentAsJson (
+$private:tempArgs = Get-ContentAsJson (
   $utf8.GetString([System.Convert]::FromBase64String('#{Base64.encode64(JSON.dump(arguments))}'))
 )
+$allowedArgs = (Get-Command "#{remote_path}").Parameters.Keys
+$private:taskArgs = @{}
+$private:tempArgs.Keys | ? { $allowedArgs -contains $_ } | % { $private:taskArgs[$_] = $private:tempArgs[$_] }
 try { & "#{remote_path}" @taskArgs } catch { Write-Error $_.Exception; exit 1 }
               PS
                 else

data/lib/bolt/version.rb

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

data/libexec/apply_catalog.rb

@@ -0,0 +1,61 @@
+#! /opt/puppetlabs/puppet/bin/ruby
+# frozen_string_literal: true
+
+require 'json'
+require 'puppet'
+require 'puppet/configurer'
+require 'tempfile'
+
+args = JSON.parse(STDIN.read)
+
+Puppet.initialize_settings([])
+run_mode = Puppet::Util::RunMode[:user]
+Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
+
+Puppet::ApplicationSupport.push_application_context(run_mode, :local)
+
+# Avoid extraneous output
+Puppet[:summarize] = false
+
+# Don't interfere with the normal agent
+Puppet[:report] = false
+Puppet[:graph] = false
+
+# Get a unique temporary path, but ensure the file doesn't exist or Puppet will report 'State got corrupted'
+statefile = Tempfile.new('puppet-state')
+Puppet[:statefile] = statefile.path
+statefile.close!
+
+# Make sure to apply the catalog
+Puppet[:use_cached_catalog] = false
+Puppet[:noop] = args['_noop'] || false
+Puppet[:strict_environment_mode] = false
+
+# The whole catalog
+Puppet[:tags] = nil
+Puppet[:skip_tags] = nil
+
+# And nothing but the catalog
+Puppet[:prerun_command] = nil
+Puppet[:postrun_command] = nil
+
+env = Puppet.lookup(:environments).get('production')
+
+report = if Puppet::Util::Package.versioncmp(Puppet.version, '5.0.0') > 0
+           Puppet::Transaction::Report.new
+         else
+           Puppet::Transaction::Report.new('apply')
+         end
+
+Puppet.override(current_environment: env, loaders: Puppet::Pops::Loaders.new(env)) do
+  catalog = Puppet::Resource::Catalog.from_data_hash(args['catalog']).to_ral
+  catalog.environment = env.name.to_s
+  catalog.environment_instance = env
+
+  configurer = Puppet::Configurer.new
+  configurer.run(catalog: catalog, report: report, pluginsync: false)
+end
+
+puts JSON.pretty_generate(report.to_data_hash)
+
+exit report.exit_status != 1

data/vendored/puppet/lib/puppet/application.rb

@@ -209,7 +209,14 @@ class Application
     # @return [Array<String>] the names of available applications
     # @api public
     def available_application_names
-      @loader.files_to_load.map do |fn|
+      # Use our configured environment to load the application, as it may
+      # be in a module we installed locally, otherwise fallback to our
+      # current environment (*root*). Once we load the application the
+      # current environment will change from *root* to the application
+      # specific environment.
+      environment = Puppet.lookup(:environments).get(Puppet[:environment]) ||
+                    Puppet.lookup(:current_environment)
+      @loader.files_to_load(environment).map do |fn|
         ::File.basename(fn, '.rb')
       end.uniq
     end

data/vendored/puppet/lib/puppet/application/device.rb

@@ -208,18 +208,11 @@ Licensed under the Apache 2.0 License
 
   def main
     if options[:resource] and !options[:target]
-      Puppet.err _("resource command requires target")
-      exit(1)
+      raise _("resource command requires target")
     end
     unless options[:apply].nil?
-      if options[:target].nil?
-        Puppet.err _("missing argument: --target is required when using --apply")
-        exit(1)
-      end
-      unless File.file?(options[:apply])
-        Puppet.err _("%{file} does not exist, cannot apply") % { file: options[:apply] }
-        exit(1)
-      end
+      raise _("missing argument: --target is required when using --apply") if options[:target].nil?
+      raise _("%{file} does not exist, cannot apply") % { file: options[:apply] } unless File.file?(options[:apply])
     end
     vardir = Puppet[:vardir]
     confdir = Puppet[:confdir]
@@ -235,7 +228,7 @@ Licensed under the Apache 2.0 License
       end
       if devices.empty?
         if options[:target]
-          Puppet.err _("Target device / certificate '%{target}' not found in %{config}") % { target: options[:target], config: Puppet[:deviceconfig] }
+          raise _("Target device / certificate '%{target}' not found in %{config}") % { target: options[:target], config: Puppet[:deviceconfig] }
         else
           Puppet.err _("No device found in %{config}") % { config: Puppet[:deviceconfig] }
           exit(1)
@@ -260,9 +253,7 @@ Licensed under the Apache 2.0 License
           if options[:resource]
             type, name = parse_args(command_line.args)
             Puppet.info _("retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { resource: type, target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
-
             resources = find_resources(type, name)
-
             if options[:to_yaml]
               text = resources.map do |resource|
                 resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml.force_encoding(Encoding.default_external)
@@ -274,6 +265,7 @@ Licensed under the Apache 2.0 License
               end.join("\n")
             end
             (puts text)
+            0
           elsif options[:apply]
             # avoid reporting to server
             Puppet::Transaction::Report.indirection.terminus_class = :yaml
@@ -352,27 +344,31 @@ Licensed under the Apache 2.0 License
   end
 
   def setup
-    setup_logs
+    if options[:resource]
+      Puppet.settings.use :main, :agent, :ssl
+    else
+      setup_logs
 
-    args[:Server] = Puppet[:server]
-    if options[:centrallogs]
-      logdest = args[:Server]
+      args[:Server] = Puppet[:server]
+      if options[:centrallogs]
+        logdest = args[:Server]
 
-      logdest += ":" + args[:Port] if args.include?(:Port)
-      Puppet::Util::Log.newdestination(logdest)
-    end
+        logdest += ":" + args[:Port] if args.include?(:Port)
+        Puppet::Util::Log.newdestination(logdest)
+      end
 
-    Puppet.settings.use :main, :agent, :device, :ssl
+      Puppet.settings.use :main, :agent, :device, :ssl
 
-    # We need to specify a ca location for all of the SSL-related
-    # indirected classes to work; in fingerprint mode we just need
-    # access to the local files and we don't need a ca.
-    Puppet::SSL::Host.ca_location = :remote
+      # We need to specify a ca location for all of the SSL-related
+      # indirected classes to work; in fingerprint mode we just need
+      # access to the local files and we don't need a ca.
+      Puppet::SSL::Host.ca_location = :remote
 
-    Puppet::Transaction::Report.indirection.terminus_class = :rest
+      Puppet::Transaction::Report.indirection.terminus_class = :rest
 
-    if Puppet[:catalog_cache_terminus]
-      Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus].intern
+      if Puppet[:catalog_cache_terminus]
+        Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus].intern
+      end
     end
   end
 end

data/vendored/puppet/lib/puppet/application/doc.rb

@@ -40,7 +40,8 @@ class Puppet::Application::Doc < Puppet::Application
 
   option("--list", "-l") do |arg|
     require 'puppet/util/reference'
-    puts Puppet::Util::Reference.references.collect { |r| Puppet::Util::Reference.reference(r).doc }.join("\n")
+    refs = Puppet::Util::Reference.references(Puppet.lookup(:current_environment))
+    puts refs.collect { |r| Puppet::Util::Reference.reference(r).doc }.join("\n")
     exit(0)
   end
 
@@ -198,7 +199,8 @@ HELP
     if options[:all]
       # Don't add dynamic references to the "all" list.
       require 'puppet/util/reference'
-      options[:references] = Puppet::Util::Reference.references.reject do |ref|
+      refs = Puppet::Util::Reference.references(Puppet.lookup(:current_environment))
+      options[:references] = refs.reject do |ref|
         Puppet::Util::Reference.reference(ref).dynamic?
       end
     end

data/vendored/puppet/lib/puppet/configurer/plugin_handler.rb

@@ -41,8 +41,7 @@ class Puppet::Configurer::PluginHandler
       result += locales_downloader.evaluate
     end
 
-
-    Puppet::Util::Autoload.reload_changed
+    Puppet::Util::Autoload.reload_changed(Puppet.lookup(:current_environment))
 
     result
   end

data/vendored/puppet/lib/puppet/datatypes.rb

@@ -207,7 +207,7 @@ module Puppet::DataTypes
     end
 
     def load_file(file_name)
-      Puppet::Util::Autoload.load_file(file_name, nil)
+      Puppet::Util::Autoload.load_file(file_name, Puppet.lookup(:current_environment))
     end
   end
 end

data/vendored/puppet/lib/puppet/defaults.rb

@@ -272,10 +272,10 @@ module Puppet
     },
     :configprint => {
         :default  => "",
-        :desc     => "Print the value of a specific configuration setting.  If the name of a
+        :desc     => "Prints the value of a specific configuration setting.  If the name of a
           setting is provided for this, then the value is printed and puppet
           exits.  Comma-separate multiple values.  For a list of all values,
-          specify 'all'.",
+          specify 'all'. This setting is deprecated, the 'puppet config' command replaces this functionality.",
     },
     :color => {
       :default => "ansi",
@@ -697,10 +697,6 @@ module Puppet
         :default  => (Puppet.features.microsoft_windows? ? Dir.tmpdir() : '$vardir/puppet-module'),
         :desc     => "The directory into which module tool data is stored",
     },
-    :module_skeleton_dir => {
-        :default  => '$module_working_dir/skeleton',
-        :desc     => "The directory which the skeleton for module tool generate is stored.",
-    },
     :forge_authorization => {
         :default  => nil,
         :desc     => "The authorization key to connect to the Puppet Forge. Leave blank for unauthorized or license based connections",

data/vendored/puppet/lib/puppet/environments.rb

@@ -313,14 +313,9 @@ module Puppet::Environments
       @cache_expiration_service || DefaultCacheExpirationService.new
     end
 
-    # Returns the end of time (the next Mesoamerican Long Count cycle-end after 2012 (5125+2012) = 7137,
-    # or for a 32 bit machine using Ruby < 1.9.3, the year 2038.
+    # Returns the end of time (the next Mesoamerican Long Count cycle-end after 2012 (5125+2012) = 7137
     def self.end_of_time
-      begin
-        Time.gm(7137)
-      rescue ArgumentError
-        Time.gm(2038)
-      end
+      Time.gm(7137)
     end
 
     END_OF_TIME = end_of_time
@@ -443,10 +438,9 @@ module Puppet::Environments
     # Also clears caches in Settings that may prevent the entry from being updated
     def evict_if_expired(name)
       if (result = @cache[name]) && (result.expired? || @cache_expiration_service.expired?(name))
-      Puppet.debug {"Evicting cache entry for environment '#{name}'"}
-        @cache.delete(name)
+        Puppet.debug {"Evicting cache entry for environment '#{name}'"}
         @cache_expiration_service.evicted(name)
-
+        clear(name)
         Puppet.settings.clear_environment_settings(name)
       end
     end

data/vendored/puppet/lib/puppet/error.rb

@@ -3,7 +3,7 @@ module Puppet
   class Error < RuntimeError
     attr_accessor :original
     def initialize(message, original=nil)
-      super(Puppet::Util::CharacterEncoding.scrub(message))
+      super(message.scrub)
       @original = original
     end
   end

data/vendored/puppet/lib/puppet/etc.rb

@@ -143,10 +143,12 @@ module Puppet::Etc
       struct.each_pair do |member, value|
         if value.is_a?(String)
           new_struct["canonical_#{member}".to_sym] = value.dup
-          new_struct[member] = Puppet::Util::CharacterEncoding.scrub(Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(value))
+          new_struct[member] = Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(value).scrub
         elsif value.is_a?(Array)
           new_struct["canonical_#{member}".to_sym] = value.inject([]) { |acc, elem| acc << elem.dup }
-          new_struct[member] = value.inject([]) { |acc, elem| acc << Puppet::Util::CharacterEncoding.scrub(Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(elem)) }
+          new_struct[member] = value.inject([]) do |acc, elem|
+            acc << Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(elem).scrub
+          end
         else
           new_struct["canonical_#{member}".to_sym] = value
           new_struct[member] = value
@@ -156,6 +158,3 @@ module Puppet::Etc
     end
   end
 end
-
-
-

data/vendored/puppet/lib/puppet/face/config.rb

@@ -39,7 +39,7 @@ Puppet::Face.define(:config, '0.0.1') do
     description <<-'EOT'
       Prints the value of a single setting or a list of settings.
 
-      This action is an alternate interface to the information available with
+      This action is a replacement interface to the information available with
       `puppet <subcommand> --configprint`.
     EOT
     notes <<-'EOT'

data/vendored/puppet/lib/puppet/face/module/build.rb

@@ -1,64 +1,14 @@
 Puppet::Face.define(:module, '1.0.0') do
   action(:build) do
     summary _("Build a module release package.")
-    description <<-EOT
-      Prepares a local module for release on the Puppet Forge by building a
-      ready-to-upload archive file.
-      Note: Module build uses MD5 checksums, which are prohibited on FIPS enabled systems.
-
-      This action uses the metadata.json file in the module directory to set metadata
-      used by the Forge. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for more
-      about writing metadata.json files.
-
-      After being built, the release archive file can be found in the module's
-      `pkg` directory.
-    EOT
-
-    returns _("Pathname object representing the path to the release archive.")
-
-    examples <<-EOT
-      Build a module release:
-
-      $ puppet module build puppetlabs-apache
-      notice: Building /Users/kelseyhightower/puppetlabs-apache for release
-      Module built: /Users/kelseyhightower/puppetlabs-apache/pkg/puppetlabs-apache-0.0.1.tar.gz
-
-      Build the module in the current working directory:
-
-      $ cd /Users/kelseyhightower/puppetlabs-apache
-      $ puppet module build
-      notice: Building /Users/kelseyhightower/puppetlabs-apache for release
-      Module built: /Users/kelseyhightower/puppetlabs-apache/pkg/puppetlabs-apache-0.0.1.tar.gz
-    EOT
-
-    arguments _("[<path>]")
+    #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+    description _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
 
     when_invoked do |*args|
-      options = args.pop
-      if options.nil? or args.length > 1 then
-        raise ArgumentError, _("puppet module build only accepts 0 or 1 arguments")
-      end
-
-      module_path = args.first
-      if module_path.nil?
-        pwd = Dir.pwd
-        module_path = Puppet::ModuleTool.find_module_root(pwd)
-        if module_path.nil?
-          raise _("Unable to find metadata.json in module root %{pwd} or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format.") % { pwd: pwd }
-        end
-      else
-        unless Puppet::ModuleTool.is_module_root?(module_path)
-          raise _("Unable to find metadata.json in module root %{module_path} or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format.") % { module_path: module_path }
-        end
-      end
-
-      Puppet::ModuleTool.set_option_defaults options
-      Puppet::ModuleTool::Applications::Builder.run(module_path, options)
+      #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+      raise _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
     end
 
-    when_rendering :console do |return_value|
-      # Get the string representation of the Pathname object.
-      _("Module built: %{path}") % { path: return_value.expand_path.to_s }
-    end
+    deprecate
   end
 end