bolt 0.25.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5ae133bdd2f4e2a8d0c8b0660c0f80d3f4187efd005ccdeb02694775c9f8af
-  data.tar.gz: 870bb25eeaaefb615d637767909ff607550a12d572a8360ae9f8a386dd86d11e
+  metadata.gz: 1e8d1a8d37a48ddf246cd058bbe4b071732c000c90592da48aac5ed7285143cf
+  data.tar.gz: 9c1aeade908ced86c6d6b6f3e459949c438e0831e4dfc2401daaca6124663077
 SHA512:
-  metadata.gz: fb2090aac1cab95bbffa72ca1bb99af214ed910512e5fd19878b9d832518e2ee56df623c1ad74c41b160fc129bc7cf2904a876b267d2dfe8c2391fecdd941468
-  data.tar.gz: ff0d54e1b27bfcf35b3d78e6f4e9d95d5b470abf5aa2311acc85459a54bb9a8746a103633fb24bc55520406ac7eeba863ada6023185e6f0f8a9e1a36fe206b4e
+  metadata.gz: e060cf1af91bfe4f3f6ea97d83e38fd4ed5a65a2fdc1e3d1af28337bb59835fa2fba62cc34d98d7000c37426f5ea76b83e7bd2d540f48c09a40aef8f37cdf202
+  data.tar.gz: d01e9efae28d08b0dffaab1bd6ca6b2679c01b7f390473a09557f61118a957d909f509e0aa480999bc0b8df3dced6b00bea2806ad6a89fb9f1d8bd5ccf0c4e5c

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

@@ -98,9 +98,8 @@ Puppet::Functions.create_function(:run_task) do
 
     options['_description'] = description if description
 
-    # Don't bother loading the local task definition if all targets use the 'pcp' transport
-    # and the local-validation option is set to false for all of them
-    if !targets.empty? && targets.all? { |t| t.protocol == 'pcp' && t.options['local-validation'] == false }
+    # Don't bother loading the local task definition if all targets use the 'pcp' transport.
+    if !targets.empty? && targets.all? { |t| t.protocol == 'pcp' }
       # create a fake task
       task = Bolt::Task.new(name: task_name, files: [{ 'name' => '', 'path' => '' }])
     else

data/lib/bolt/bolt_option_parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# Note this file includes very few 'requires' because it expects to be used from the CLI.
+
 require 'optparse'
 
 module Bolt

data/lib/bolt/catalog.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+require 'bolt/config'
+require 'bolt/inventory'
 require 'bolt/pal'
 require 'bolt/puppetdb'
+require 'bolt/util'
 
 Bolt::PAL.load_puppet
 
@@ -53,6 +56,7 @@ module Bolt
       pal_main = request['code_ast'] || request['code_string']
       target = request['target']
       pdb_client = Bolt::PuppetDB::Client.new(Bolt::PuppetDB::Config.new(request['pdb_config']))
+      options = request['puppet_config'] || {}
 
       with_puppet_settings(request['hiera_config']) do
         Puppet[:rich_data] = true
@@ -65,6 +69,10 @@ module Bolt
                           bolt_inventory: setup_inventory(request['inventory'])) do
             Puppet.lookup(:pal_current_node).trusted_data = target['trusted']
             pal.with_catalog_compiler do |compiler|
+              # Configure language strictness in the CatalogCompiler. We want Bolt to be able
+              # to compile most Puppet 4+ manifests, so we default to allowing deprecated functions.
+              Puppet[:strict] = options['strict'] || :warning
+              Puppet[:strict_variables] = options['strict_variables'] || false
               ast = Puppet::Pops::Serialization::FromDataConverter.convert(pal_main)
               compiler.evaluate(ast)
               compiler.compile_additions

data/lib/bolt/cli.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Avoid requiring the CLI from other files. It has side-effects - such as loading r10k -
+# that are undesirable when using Bolt as a library.
+
 require 'uri'
 require 'benchmark'
 require 'json'

data/lib/bolt/config.rb

@@ -5,7 +5,6 @@ require 'logging'
 require 'concurrent'
 require 'pathname'
 require 'bolt/boltdir'
-require 'bolt/cli'
 require 'bolt/transport/ssh'
 require 'bolt/transport/winrm'
 require 'bolt/transport/orch'
@@ -49,8 +48,7 @@ module Bolt
         'ssl-verify' => true
       },
       pcp: {
-        'task-environment' => 'production',
-        'local-validation' => false
+        'task-environment' => 'production'
       },
       local: {}
     }.freeze

data/lib/bolt/inventory.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'set'
-require 'bolt/util'
-require 'bolt/target'
+require 'bolt/config'
 require 'bolt/inventory/group'
+require 'bolt/target'
+require 'bolt/util'
 
 module Bolt
   class Inventory

data/lib/bolt/inventory/group.rb

@@ -59,14 +59,6 @@ module Bolt
         value
       end
 
-      def check_deprecated_config(context, name, config)
-        if config && config['transports']
-          msg = "#{context} #{name} contains invalid config option 'transports', see " \
-                "https://puppet.com/docs/bolt/0.x/inventory_file.html for the updated format"
-          raise ValidationError.new(msg, @name)
-        end
-      end
-
       def validate(used_names = Set.new, node_names = Set.new, depth = 0)
         if used_names.include?(@name)
           raise ValidationError.new("Tried to redefine group #{@name}", @name)
@@ -77,8 +69,6 @@ module Bolt
           raise ValidationError.new("Group #{@name} conflicts with node of the same name", @name)
         end
 
-        check_deprecated_config('Group', @name, @config)
-
         used_names << @name
 
         @nodes.each_value do |n|
@@ -95,8 +85,6 @@ module Bolt
             raise ValidationError.new("Group #{n['name']} conflicts with node of the same name", n['name'])
           end
 
-          check_deprecated_config('Node', n['name'], n['config'])
-
           node_names << n['name']
         end
 

data/lib/bolt/transport/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'logging'
+require 'bolt/result'
 
 module Bolt
   module Transport

data/lib/bolt/transport/local.rb

@@ -4,7 +4,6 @@ require 'json'
 require 'fileutils'
 require 'tmpdir'
 require 'bolt/transport/base'
-require 'bolt/result'
 require 'bolt/util'
 
 module Bolt

data/lib/bolt/transport/orch.rb

@@ -6,7 +6,6 @@ require 'json'
 require 'orchestrator_client'
 require 'bolt/transport/base'
 require 'bolt/transport/orch/connection'
-require 'bolt/result'
 
 module Bolt
   module Transport
@@ -23,17 +22,12 @@ module Bolt
       attr_writer :plan_context
 
       def self.options
-        %w[service-url cacert token-file task-environment local-validation]
+        %w[service-url cacert token-file task-environment]
       end
 
       PROVIDED_FEATURES = ['puppet-agent'].freeze
 
-      def self.validate(options)
-        validation_flag = options['local-validation']
-        unless !!validation_flag == validation_flag
-          raise Bolt::ValidationError, 'local-validation option must be a Boolean true or false'
-        end
-      end
+      def self.validate(options); end
 
       def initialize(*args)
         @connections = {}

data/lib/bolt/transport/winrm.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bolt/node/errors'
 require 'bolt/transport/base'
 
 module Bolt

data/lib/bolt/version.rb

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

data/lib/bolt_spec/plans.rb

@@ -2,6 +2,8 @@
 
 require 'bolt_spec/plans/mock_executor'
 require 'bolt/config'
+require 'bolt/inventory'
+require 'bolt/pal'
 
 # These helpers are intended to be used for plan unit testing without calling
 # out to target nodes. It accomplishes this by replacing bolt's executor with a

data/lib/bolt_spec/run.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-# shorthand for requiring the parts of bolt we need
-require 'bolt/cli'
+require 'bolt/analytics'
+require 'bolt/config'
+require 'bolt/executor'
+require 'bolt/inventory'
+require 'bolt/pal'
+require 'bolt/puppetdb'
 require 'bolt/util'
 
 # This is intended to provide a relatively stable method of executing bolt in process from tests.

data/libexec/custom_facts.rb

@@ -8,37 +8,29 @@ require 'tempfile'
 
 args = JSON.parse(STDIN.read)
 
-Dir.mktmpdir do |moduledir|
+Dir.mktmpdir do |puppet_root|
+  # Create temporary directories for all core Puppet settings so we don't clobber
+  # existing state or read from puppet.conf. Also create a temporary modulepath.
+  moduledir = File.join(puppet_root, 'modules')
+  Dir.mkdir(moduledir)
+  cli = Puppet::Settings::REQUIRED_APP_SETTINGS.flat_map do |setting|
+    ["--#{setting}", File.join(puppet_root, setting.to_s.chomp('dir'))]
+  end
+  cli << '--modulepath' << moduledir
+  Puppet.initialize_settings(cli)
+
   Tempfile.open('plugins.tar.gz') do |plugins|
     File.binwrite(plugins, Base64.decode64(args['plugins']))
     Puppet::ModuleTool::Tar.instance.unpack(plugins, moduledir, Etc.getlogin || Etc.getpwuid.name)
   end
 
-  Puppet.initialize_settings
-  env = Puppet.lookup(:environments).get('production').override_with(modulepath: [moduledir])
+  env = Puppet.lookup(:environments).get('production')
   env.each_plugin_directory do |dir|
     $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
   end
 
-  dirs = []
-  external_dirs = []
-  env.modules.each do |mod|
-    dirs << File.join(mod.plugins, 'facter') if mod.plugins?
-    external_dirs << mod.pluginfacts if mod.pluginfacts?
-  end
-
-  Facter.reset
-  Facter.search(*dirs) unless dirs.empty?
-  Facter.search_external(external_dirs)
-
-  if Puppet.respond_to? :initialize_facts
-    Puppet.initialize_facts
-  else
-    Facter.add(:puppetversion) do
-      setcode { Puppet.version.to_s }
-    end
-  end
-
-  puts(Facter.to_hash.to_json)
+  facts = Puppet::Node::Facts.indirection.find(SecureRandom.uuid, environment: env)
+  puts(facts.values.to_json)
 end
+
 exit 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -258,7 +258,6 @@ files:
 - bolt-modules/boltlib/lib/puppet/functions/apply_prep.rb
 - bolt-modules/boltlib/lib/puppet/functions/facts.rb
 - bolt-modules/boltlib/lib/puppet/functions/fail_plan.rb
-- bolt-modules/boltlib/lib/puppet/functions/file_upload.rb
 - bolt-modules/boltlib/lib/puppet/functions/get_targets.rb
 - bolt-modules/boltlib/lib/puppet/functions/puppetdb_fact.rb
 - bolt-modules/boltlib/lib/puppet/functions/puppetdb_query.rb

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

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# This function wraps the upload_file function with a deprecation warning, for backward compatibility.
-Puppet::Functions.create_function(:file_upload, Puppet::Functions::InternalFunction) do
-  def file_upload(*args)
-    executor = Puppet.lookup(:bolt_executor) { nil }
-    executor&.report_function_call('file_upload')
-
-    file, line = Puppet::Pops::PuppetStack.top_of_stack
-
-    msg = "The file_upload function is deprecated and will be removed; use upload_file instead"
-    Puppet.puppet_deprecation_warning(msg, key: 'bolt-function/file_upload', file: file, line: line)
-
-    call_function('upload_file', *args)
-  end
-end