puppet 4.5.3-x64-mingw32 → 4.6.1-x64-mingw32

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b30789828d15314076787a7c7617765c000eadd3
+  data.tar.gz: ef5375809bea32b02cda922b85657186765e232d
+SHA512:
+  metadata.gz: 04b5ecc4b3f2462d4ea20cb469a0d85a7b2346daeb635e045202343cf63145b8b0abf1b46ada904e626809cd2acd276eac4aeb84ae031ece3ded495c4c952a5c
+  data.tar.gz: d942a6a83698f5cf87ef499d53f4c7a1b40cdff8d5a33f190a7813595fa22583169b42deb02ec28bfc47504c99ce067373512c80794a2422c5448694537e2922

data/Gemfile

@@ -27,6 +27,9 @@ gem "puppet", :path => File.dirname(__FILE__), :require => false
 gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 2.0', '< 4'])
 gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['>= 2.0', '< 4'])
 gem "rake", "10.1.1", :require => false
+# Hiera has an unbound dependency on json_pure
+# json_pure 2.0.2+ officially requires Ruby >= 2.0, but should have specified that in 2.0
+gem 'json_pure', '~> 1.8', :require => false
 
 group(:development, :test) do
   gem "rspec", "~> 3.1", :require => false
@@ -77,10 +80,16 @@ data['gem_platform_dependencies'].each_pair do |gem_platform, info|
   next if gem_platform == 'x64-mingw32' && !x64_platform
   if bundle_deps = info['gem_runtime_dependencies']
     bundle_platform = bundle_platforms[gem_platform] or raise "Missing bundle_platform"
-    platform(bundle_platform.intern) do
+    if bundle_platform == "all"
       bundle_deps.each_pair do |name, version|
         gem(name, version, :require => false)
       end
+    else
+      platform(bundle_platform.intern) do
+        bundle_deps.each_pair do |name, version|
+          gem(name, version, :require => false)
+        end
+      end
     end
   end
 end

data/ext/debian/control

@@ -123,17 +123,15 @@ Description: Centralised configuration management - master setup to run under mo
 
 Package: vim-puppet
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, puppet (= ${source:Version})
 Recommends: vim-addon-manager
-Conflicts: puppet (<< ${source:Version})
 Description: syntax highlighting for puppet manifests in vim
  The vim-puppet package provides filetype detection and syntax highlighting for
  puppet manifests (files ending with ".pp").
 
 Package: puppet-el
 Architecture: all
-Depends: ${misc:Depends}, emacsen-common
-Conflicts: puppet (<< ${source:Version})
+Depends: ${misc:Depends}, emacsen-common, puppet (= ${source:Version})
 Description: syntax highlighting for puppet manifests in emacs
  The puppet-el package provides syntax highlighting for puppet manifests
 

data/ext/project_data.yaml

@@ -19,7 +19,7 @@ gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
   facter: ['> 2.0', '< 4']
   hiera: ['>= 2.0', '< 4']
-  json_pure:
+  json_pure: '~> 1.8'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
@@ -40,7 +40,7 @@ gem_platform_dependencies:
       win32-process: '= 0.7.5'
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
-      win32-service: '= 0.8.7'
+      win32-service: '= 0.8.8'
       minitar: '~> 0.5.4'
   x64-mingw32:
     gem_runtime_dependencies:
@@ -51,10 +51,10 @@ gem_platform_dependencies:
       win32-process: '= 0.7.5'
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
-      win32-service: '= 0.8.7'
+      win32-service: '= 0.8.8'
       minitar: '~> 0.5.4'
 bundle_platforms:
-  universal-darwin: ruby
+  universal-darwin: all
   x86-mingw32: mingw
   x64-mingw32: x64_mingw
 pre_tasks:

data/install.rb

@@ -141,6 +141,7 @@ end
 def prepare_installation
   InstallOptions.configs = true
   InstallOptions.check_prereqs = true
+  InstallOptions.batch_files = true
 
   # Only try to do docs if we're sure they have rdoc
   if $haverdoc
@@ -201,6 +202,9 @@ def prepare_installation
     opts.on('--[no-]check-prereqs', 'Prevents validation of prerequisite libraries', 'Default on') do |prereq|
       InstallOptions.check_prereqs = prereq
     end
+    opts.on('--no-batch-files', 'Prevents installation of batch files for windows', 'Default off') do |batch_files|
+      InstallOptions.batch_files = false
+    end
     opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
       InstallOptions.rdoc    = false
       InstallOptions.ri      = false
@@ -413,7 +417,7 @@ def install_binfile(from, op_file, target)
     end
   end
 
-  if $operatingsystem == "windows"
+  if $operatingsystem == "windows" && InstallOptions.batch_files
     installed_wrapper = false
 
     unless File.extname(from).match(/\.(cmd|bat)/)
@@ -471,7 +475,7 @@ FileUtils.cd File.dirname(__FILE__) do
   #build_ri(ri) if InstallOptions.ri
   do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
   do_bins(bins, InstallOptions.bin_dir)
-  do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if $operatingsystem == "windows"
+  do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if $operatingsystem == "windows" && InstallOptions.batch_files
   do_libs(libs)
   do_man(man) unless $operatingsystem == "windows"
 end

data/lib/puppet.rb

@@ -197,7 +197,8 @@ module Puppet
       :http_pool => proc {
         require 'puppet/network/http'
         Puppet::Network::HTTP::NoCachePool.new
-      }
+      },
+      :ssl_host => proc { Puppet::SSL::Host.localhost },
     }
   end
 
@@ -273,6 +274,7 @@ end
 #  effort, but I think we should strive for it and revisit this at some point.  --cprice 2012-03-16
 
 require 'puppet/indirector'
+require 'puppet/compilable_resource_type'
 require 'puppet/type'
 require 'puppet/resource'
 require 'puppet/parser'

data/lib/puppet/agent/locker.rb

@@ -23,7 +23,7 @@ module Puppet::Agent::Locker
         lockfile.unlock
       end
     else
-      fail Puppet::LockError, 'Failed to aquire lock'
+      fail Puppet::LockError, 'Failed to acquire lock'
     end
   end
 

data/lib/puppet/application.rb

@@ -75,7 +75,7 @@ module Puppet
 # Refer to +OptionParser+ documentation for the exact format.
 # * If the option method is given a block, this one will be called whenever
 # the option is encountered in the command-line argument.
-# * If the option method has no block, a default functionnality will be used, that
+# * If the option method has no block, a default functionality will be used, that
 # stores the argument (or true/false if the option doesn't require an argument) in
 # the global (to the application) options array.
 # * If a given option was not defined by a the +option+ method, but it exists as a Puppet settings:
@@ -83,7 +83,7 @@ module Puppet
 #  * if +unknown+ wasn't used, then the option/argument is handed to Puppet.settings.handlearg for
 #    a default behavior
 #
-# --help is managed directly by the Puppet::Application class, but can be overriden.
+# --help is managed directly by the Puppet::Application class, but can be overridden.
 #
 # === Setup
 # Applications can use the setup block to perform any initialization.
@@ -357,8 +357,10 @@ class Application
   end
 
   def setup_logs
-    if options[:debug] || options[:verbose]
-      Puppet::Util::Log.newdestination(:console)
+    unless options[:setdest]
+      if options[:debug] || options[:verbose]
+        Puppet::Util::Log.newdestination(:console)
+      end
     end
 
     set_log_level

data/lib/puppet/application/agent.rb

@@ -264,7 +264,7 @@ generated by running puppet agent with '--genconfig'.
 * --test:
   Enable the most common options used for testing. These are 'onetime',
   'verbose', 'no-daemonize', 'no-usecacheonfailure', 'detailed-exitcodes',
-  'no-splay', and 'show_diff'.
+  'no-splay', 'show_diff', and 'no-use_cached_catalog'.
 
 * --verbose:
   Turn on verbose reporting.
@@ -377,6 +377,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     Puppet.settings.handlearg("--no-splay")
     Puppet.settings.handlearg("--show_diff")
     Puppet.settings.handlearg("--no-daemonize")
+    Puppet.settings.handlearg("--no-use_cached_catalog")
     options[:verbose] = true
     Puppet[:onetime] = true
     options[:detailed_exitcodes] = true

data/lib/puppet/application/cert.rb

@@ -74,11 +74,31 @@ class Puppet::Application::Cert < Puppet::Application
     options[:allow_dns_alt_names] = value
   end
 
+  option("--[no-]allow-authorization-extensions") do |value|
+    options[:allow_authorization_extensions] = value
+  end
+
   option("--verbose", "-v") do |arg|
     options[:verbose] = true
     set_log_level
   end
 
+  option("--human-readable", "-H") do |arg|
+    options[:format] = :human
+  end
+
+  option("--machine-readable", "-m") do |arg|
+    options[:format] = :machine
+  end
+
+  option("--interactive", "-i") do |arg|
+    options[:interactive] = true
+  end
+
+  option("--assume-yes", "-y") do |arg|
+    options[:yes] = true
+  end
+
   def help
     <<-'HELP'
 
@@ -132,7 +152,10 @@ The most important actions for day-to-day use are 'list' and 'sign'.
   List outstanding certificate requests. If '--all' is specified, signed
   certificates are also listed, prefixed by '+', and revoked or invalid
   certificates are prefixed by '-' (the verification outcome is printed
-  in parenthesis).
+  in parenthesis). If '--human-readable' or '-H' is specified,
+  certificates are formatted in a way to improve human scan-ability. If
+  '--machine-readable' or '-m' is specified, output is formatted concisely
+  for consumption by a script.
 
 * print:
   Print the full-text version of a host's certificate.
@@ -145,7 +168,10 @@ The most important actions for day-to-day use are 'list' and 'sign'.
   needs to be restarted after revoking certificates.
 
 * sign:
-  Sign an outstanding certificate request.
+  Sign an outstanding certificate request. If '--interactive' or '-i' is
+  supplied the user will be prompted to confirm that they are signing the
+  correct certificate (recommended). If '--assume-yes' or '-y' is supplied
+  the interactive prompt will assume the answer of 'yes'.
 
 * verify:
   Verify the named certificate against the local CA certificate.
@@ -187,6 +213,11 @@ configuration options can also be generated by running puppet cert with
   command line. The output of 'puppet cert list' shows any requested alt names
   for pending certificate requests.
 
+* --allow-authorization-extensions:
+  Enable the signing of a request with authorization extensions. Such requests
+  are sensitive because they can be used to write access rules in Puppet Server.
+  Currently, this is the only means by which such requests can be signed.
+
 * --digest:
   Set the digest for fingerprinting (defaults to the digest used when
   signing the cert). Valid values depends on your openssl and openssl ruby
@@ -246,6 +277,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     Puppet::SSL::Oids.register_puppet_oids
+    Puppet::SSL::Oids.load_custom_oid_file(Puppet[:trusted_oid_mapping_file])
 
     Puppet::Util::Log.newdestination :console
 
@@ -283,6 +315,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
         exit
       end
     end
+
     result
   end
 

data/lib/puppet/application/device.rb

@@ -118,7 +118,7 @@ parameter, so you can specify '--server <servername>' as an argument.
   code of '1' means at least one device had a compile failure, an exit code of
   '2' means at least one device had resource changes, and an exit code of '4'
   means at least one device had resource failures. Exit codes of '3', '5', '6',
-  or '7' means that a bitwise combination of the preceeding exit codes happened.
+  or '7' means that a bitwise combination of the preceding exit codes happened.
 
 * --help:
   Print this help message

data/lib/puppet/application/generate.rb

@@ -0,0 +1,5 @@
+require 'puppet/application/face_base'
+
+# The Generate application. 
+class Puppet::Application::Generate < Puppet::Application::FaceBase
+end

data/lib/puppet/application/lookup.rb

@@ -144,7 +144,7 @@ http://links.puppetlabs.com/lookup-docs
 
 OPTIONS
 -------
-These options and their effects are decribed in more detail in
+These options and their effects are described in more detail in
 the puppet lookup function linked to above.
 
 * --help:
@@ -174,7 +174,7 @@ the puppet lookup function linked to above.
 
 * --explain
   Print an explanation for the details of how the lookup performed rather
-  than the value returned for the key. The explaination will describe how
+  than the value returned for the key. The explanation will describe how
   the result was obtained or why lookup failed to obtain the result.
 
 * --explain-options
@@ -294,7 +294,7 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
     generate_scope do |scope|
       lookup_invocation = Puppet::Pops::Lookup::Invocation.new(scope, {}, {}, explain ? Puppet::Pops::Lookup::Explainer.new(explain_options, only_explain_options) : nil)
       begin
-        type = options.include?(:type) ? Puppet::Pops::Types::TypeParser.new.parse(options[:type], scope) : nil
+        type = options.include?(:type) ? Puppet::Pops::Types::TypeParser.singleton.parse(options[:type], scope) : nil
         result = Puppet::Pops::Lookup.lookup(keys, type, options[:default_value], use_default_value, merge_options, lookup_invocation)
         puts renderer.render(result) unless explain
       rescue Puppet::DataBinding::LookupError

data/lib/puppet/application_support.rb

@@ -36,7 +36,7 @@ module Puppet
     end
 
     # Reads the routes YAML settings from the file specified by Puppet[:route_file]
-    # and resets indirector terminii for the current application class if listed.
+    # and resets indirector termini for the current application class if listed.
     #
     # For instance, PE uses this to set the master facts terminus
     # to 'puppetdb' and its cache terminus to 'yaml'.

data/lib/puppet/compilable_resource_type.rb

@@ -0,0 +1,15 @@
+require 'puppet'
+# The CompilableResourceType module should be either included in a class or used as a class extension
+# to mark that the instance used as the 'resource type' of a resource instance
+# is an object that is compatible with Puppet::Type's API wrt. compiling.
+# Puppet Resource Types written in Ruby use a meta programmed Ruby Class as the type. Those classes
+# are subtypes of Puppet::Type. Meta data (Pcore/puppet language) based resource types uses instances of
+# a class instead.
+# 
+module Puppet::CompilableResourceType
+  # All 3.x resource types implemented in Ruby using Puppet::Type respond true.
+  # Other kinds of implementations should reimplement and return false.
+  def is_3x_ruby_plugin?
+    true
+  end
+end

data/lib/puppet/configurer.rb

@@ -181,9 +181,45 @@ class Puppet::Configurer
   # which accepts :tags and :ignoreschedules.
   def run(options = {})
     pool = Puppet::Network::HTTP::Pool.new(Puppet[:http_keepalive_timeout])
+    # We create the report pre-populated with default settings for
+    # environment and transaction_uuid very early, this is to ensure
+    # they are sent regardless of any catalog compilation failures or
+    # exceptions.
+    options[:report] ||= Puppet::Transaction::Report.new("apply", nil, @environment, @transaction_uuid)
+    report = options[:report]
+    init_storage
+
+    Puppet::Util::Log.newdestination(report)
+
     begin
       Puppet.override(:http_pool => pool) do
-        run_internal(options)
+
+        # Skip failover logic if the server_list setting is empty
+        if Puppet.settings[:server_list].nil? || Puppet.settings[:server_list].empty?
+          do_failover = false;
+        else
+          do_failover = true
+        end
+        # When we are passed a catalog, that means we're in apply
+        # mode. We shouldn't try to do any failover in that case.
+        if options[:catalog].nil? && do_failover
+          found = find_functional_server()
+          server = found[:server]
+          if server.nil?
+            Puppet.warning "Could not select a functional puppet master"
+            server = [nil, nil]
+          end
+          Puppet.override(:server => server[0], :serverport => server[1]) do
+            if !server.first.nil?
+              Puppet.debug "Selected master: #{server[0]}:#{server[1]}"
+              report.master_used = "#{server[0]}:#{server[1]}"
+            end
+
+            run_internal(options.merge(:node => found[:node]))
+          end
+        else
+          run_internal(options)
+        end
       end
     ensure
       pool.close
@@ -191,15 +227,7 @@ class Puppet::Configurer
   end
 
   def run_internal(options)
-    # We create the report pre-populated with default settings for
-    # environment and transaction_uuid very early, this is to ensure
-    # they are sent regardless of any catalog compilation failures or
-    # exceptions.
-    options[:report] ||= Puppet::Transaction::Report.new("apply", nil, @environment, @transaction_uuid)
     report = options[:report]
-    init_storage
-
-    Puppet::Util::Log.newdestination(report)
 
     # If a cached catalog is explicitly requested, attempt to retrieve it. Skip the node request,
     # don't pluginsync and switch to the catalog's environment if we successfully retrieve it.
@@ -233,7 +261,7 @@ class Puppet::Configurer
       # We only need to find out the environment to run in if we don't already have a catalog
       unless (options[:catalog] || Puppet[:strict_environment_mode])
         begin
-          if node = Puppet::Node.indirection.find(Puppet[:node_name_value],
+          if node = options[:node] || Puppet::Node.indirection.find(Puppet[:node_name_value],
               :environment => Puppet::Node::Environment.remote(@environment),
               :configured_environment => configured_environment,
               :ignore_cache => true,
@@ -328,6 +356,35 @@ class Puppet::Configurer
   end
   private :run_internal
 
+  def find_functional_server()
+    configured_environment = Puppet[:environment] if Puppet.settings.set_by_config?(:environment)
+
+    node = nil
+    selected_server = Puppet.settings[:server_list].find do |server|
+      # Puppet.override doesn't return the result of its block, so we
+      # need to handle this manually
+      found = false
+      server[1] ||= Puppet[:masterport]
+      Puppet.override(:server => server[0], :serverport => server[1]) do
+        begin
+          node = Puppet::Node.indirection.find(Puppet[:node_name_value],
+              :environment => Puppet::Node::Environment.remote(@environment),
+              :configured_environment => configured_environment,
+              :ignore_cache => true,
+              :transaction_uuid => @transaction_uuid,
+              :fail_on_404 => false)
+          found = true
+        rescue Exception => e
+          # Nothing to see here
+        end
+      end
+      found
+    end
+    { :node => node,
+      :server => selected_server }
+  end
+  private :find_functional_server
+
   def send_report(report)
     puts report.summary if Puppet[:summarize]
     save_last_run_summary(report)