puppet 5.5.16-universal-darwin → 5.5.17-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53cbc148eb43edb744a2750a884b748514038b84c5245622a84dba14c1b12c33
-  data.tar.gz: 652ad891715edda33fc101b0d0bd8d2605a3bc601b8672e10a9ef4216dd03092
+  metadata.gz: d4a05f75d604be5c1f1798982f27927909b9673ee26cba0660dc21a8fa4d1777
+  data.tar.gz: a58f4dd277e286f7fc6e287de3152e4e3f0042a572230c112f61c0ff2b173991
 SHA512:
-  metadata.gz: c5af9bdc9bf37665cfc51ada652552f77454f44fda12050b04b04514033a66e37fa4333fa669abddc4f5e88e42b8b4981aa9e92cb78bbef784f8b9a5f5f716f6
-  data.tar.gz: c9df2ba4c230c292d21bdc02d65489347b294aded44485220e577f81985e59fd6bea5d6fdc3cdea426cb33beeaa321e8f67a38ac5fc13e2c0a6ab3cfbb901c73
+  metadata.gz: 821e008f51a358c08bcb2e416440b929d368ecddb7f5caa7d9ffd79d163b733c8a0c409ce853a23a129c1d378e46a6c5991de6c50ecc89476f7c0f38b8488fea
+  data.tar.gz: 208b305212aae08ecc637ea4c852a6d7c5dc3075edce72d4cea1b177119f88fc68efebb11f1127072b0a8b5388ee90aa7d4598411512f47436fe4ee26bf01049

data/CODEOWNERS

@@ -1,15 +1,15 @@
 # default to platform-core
 * @puppetlabs/platform-core
 
-# platform-os
-/lib/puppet/type/group @puppetlabs/platform-os
-/lib/puppet/type/package @puppetlabs/platform-os
-/lib/puppet/type/service @puppetlabs/platform-os
-/lib/puppet/type/user @puppetlabs/platform-os
-/lib/puppet/provider/group @puppetlabs/platform-os
-/lib/puppet/provider/package @puppetlabs/platform-os
-/lib/puppet/provider/service @puppetlabs/platform-os
-/lib/puppet/provider/user @puppetlabs/platform-os
+# Night's Watch
+/lib/puppet/type/group @puppetlabs/night-s-watch
+/lib/puppet/type/package @puppetlabs/night-s-watch
+/lib/puppet/type/service @puppetlabs/night-s-watch
+/lib/puppet/type/user @puppetlabs/night-s-watch
+/lib/puppet/provider/group @puppetlabs/night-s-watch
+/lib/puppet/provider/package @puppetlabs/night-s-watch
+/lib/puppet/provider/service @puppetlabs/night-s-watch
+/lib/puppet/provider/user @puppetlabs/night-s-watch
 
 # language
 /lib/puppet/datatypes @puppetlabs/language

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (5.5.16)
+    puppet (5.5.17)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -23,12 +23,12 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    facter (2.5.1)
+    facter (2.5.6)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gettext-setup (0.30)
+    gettext-setup (0.31)
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2)
       locale
@@ -48,16 +48,16 @@ GEM
     method_source (0.9.2)
     mocha (1.9.0)
       metaclass (~> 0.0.1)
-    msgpack (1.3.0)
+    msgpack (1.3.1)
     multi_json (1.13.1)
     mustache (1.1.0)
     net-ssh (4.2.0)
     optimist (3.0.0)
-    packaging (0.99.36)
+    packaging (0.99.44)
       artifactory (~> 2)
-      rake (~> 12.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+      rake (>= 12.3)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pathspec (0.2.1)
     powerpack (0.1.2)
@@ -65,7 +65,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     puppet-lint (2.3.6)
-    puppet-syntax (2.5.0)
+    puppet-syntax (2.6.0)
       rake
     puppetlabs_spec_helper (2.14.1)
       mocha (~> 1.0)
@@ -76,7 +76,7 @@ GEM
     racc (1.4.9)
     rack (1.6.11)
     rainbow (2.1.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rdiscount (2.2.0.1)
     rdoc (4.3.0)
     redcarpet (2.3.0)
@@ -88,24 +88,24 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-collection_matchers (1.1.3)
+    rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-expectations (3.8.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-legacy_formatters (1.0.1)
+    rspec-legacy_formatters (1.0.2)
       rspec (~> 3.0)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-puppet (2.7.5)
+    rspec-puppet (2.7.7)
       rspec
-    rspec-support (3.8.2)
+    rspec-support (3.8.3)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -115,7 +115,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (0.18.0)
+    ruby-prof (1.0.0)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     text (1.3.1)
@@ -165,4 +165,4 @@ DEPENDENCIES
   yarjuf (~> 2.0)
 
 BUNDLED WITH
-   1.16.5
+   1.17.3

data/ext/project_data.yaml

@@ -45,7 +45,7 @@ gem_platform_dependencies:
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
       win32-service: '= 0.8.8'
-      minitar: '~> 0.6.1'
+      minitar: '~> 0.9'
   x64-mingw32:
     gem_runtime_dependencies:
       # ffi is pinned due to PUP-8438
@@ -56,7 +56,7 @@ gem_platform_dependencies:
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
       win32-service: '= 0.8.8'
-      minitar: '~> 0.6.1'
+      minitar: '~> 0.9'
 bundle_platforms:
   universal-darwin: all
   x86-mingw32: mingw

data/install.rb

@@ -62,24 +62,6 @@ def do_configs(configs, target, strip = 'conf/')
     ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, ''))
     FileUtils.install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
   end
-
-  if $operatingsystem == 'windows'
-    src_dll = 'ext/windows/eventlog/puppetres.dll'
-    dst_dll = File.join(InstallOptions.bin_dir, 'puppetres.dll')
-    FileUtils.install(src_dll, dst_dll, {:mode => 0644, :preserve => true, :verbose => true})
-
-    require 'win32/registry'
-    include Win32::Registry::Constants
-
-    begin
-      Win32::Registry::HKEY_LOCAL_MACHINE.create('SYSTEM\CurrentControlSet\services\eventlog\Application\Puppet', KEY_ALL_ACCESS | 0x0100) do |reg|
-        reg.write_s('EventMessageFile', dst_dll.tr('/', '\\'))
-        reg.write_i('TypesSupported', 0x7)
-      end
-    rescue Win32::Registry::Error => e
-      warn "Failed to create puppet eventlog registry key: #{e}"
-    end
-  end
 end
 
 def do_bins(bins, target, strip = 's?bin/')
@@ -140,12 +122,12 @@ def check_prereqs
         facter_version = Facter.version.to_f
         if facter_version < MIN_FACTER_VERSION
           puts "Facter version: #{facter_version}; minimum required: #{MIN_FACTER_VERSION}; cannot install"
-          exit -1
+          exit (-1)
         end
       end
     rescue LoadError
       puts "Could not load #{pre}; cannot install"
-      exit -1
+      exit (-1)
     end
   }
 end
@@ -266,7 +248,7 @@ def prepare_installation
       require 'win32/dir'
     rescue LoadError => e
       puts "Cannot run on Microsoft Windows without the win32-process, win32-dir & win32-service gems: #{e}"
-      exit -1
+      exit (-1)
     end
   end
 

data/lib/puppet/application/agent.rb

@@ -344,6 +344,8 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       # Setup signal traps immediately after daemonization so we clean up the daemon
       daemon.set_signal_traps
 
+      log_config if Puppet[:daemonize]
+
       wait_for_certificates
 
       if Puppet[:onetime]
@@ -354,6 +356,16 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     end
   end
 
+  def log_config
+    #skip also config reading and parsing if debug is not enabled
+    return unless Puppet::Util::Log.sendlevel?(:debug)
+
+    Puppet.settings.stringify_settings(:agent, :all).each_pair do |k,v|
+      next if k.include?("password") || v.to_s.empty?
+      Puppet.debug("Using setting: #{k}=#{v}")
+    end
+  end
+
   def fingerprint
     host = Puppet::SSL::Host.new
     unless cert = host.certificate || host.certificate_request

data/lib/puppet/application/device.rb

@@ -297,10 +297,10 @@ Licensed under the Apache 2.0 License
             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)
-              end.join("\n")
-              text.prepend("#{type.downcase}:\n")
+              data = resources.map do |resource|
+                resource.prune_parameters(:parameters_to_include => @extra_params).to_hiera_hash
+              end.inject(:merge!)
+              text = YAML.dump(type.downcase => data)
             else
               text = resources.map do |resource|
                 resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)

data/lib/puppet/application/resource.rb

@@ -142,10 +142,10 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       resources = find_or_save_resources(type, name, params)
 
     if options[:to_yaml]
-      text = resources.map do |resource|
-        resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml.force_encoding(Encoding.default_external)
-      end.join("\n")
-      text.prepend("#{type.downcase}:\n")
+      data = resources.map do |resource|
+        resource.prune_parameters(:parameters_to_include => @extra_params).to_hiera_hash
+      end.inject(:merge!)
+      text = YAML.dump(type.downcase => data)
     else
       text = resources.map do |resource|
         resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)

data/lib/puppet/defaults.rb

@@ -550,6 +550,10 @@ module Puppet
         contains any characters with special meanings in URLs (as specified by RFC 3986
         section 2.2), they must be URL-encoded. (For example, `#` would become `%23`.)",
     },
+    :no_proxy => {
+      :default    => "localhost, 127.0.0.1",
+      :desc       => "List of domain names that should not go through `http_proxy_host`. Environment variable no_proxy or NO_PROXY will override this value.",
+    },
     :http_keepalive_timeout => {
       :default    => "4s",
       :type       => :duration,

data/lib/puppet/face/config.rb

@@ -66,41 +66,18 @@ Puppet::Face.define(:config, '0.0.1') do
         @default_section = true
       end
 
-      render_all_settings = args.empty? || args == ['all']
-
-      args = Puppet.settings.to_a.collect(&:first) if render_all_settings
-
-      values_from_the_selected_section =
-        Puppet.settings.values(nil, options[:section].to_sym)
-
-      loader_settings = {
-        :environmentpath => values_from_the_selected_section.interpolate(:environmentpath),
-        :basemodulepath => values_from_the_selected_section.interpolate(:basemodulepath),
-      }
-
-      to_be_rendered = nil
-      Puppet.override(Puppet.base_context(loader_settings),
-                     _("New environment loaders generated from the requested section.")) do
-        # And now we can lookup values that include those from environments configured from
-        # the requested section
-        values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
-
-        if Puppet::Util::Log.sendlevel?(:info)
-          warn_default_section(options[:section]) if @default_section
-          report_section_and_environment(options[:section], Puppet.settings[:environment])
-        end
-
-        to_be_rendered = {}
-        args.sort.each do |setting_name|
-          to_be_rendered[setting_name] = values.print(setting_name.to_sym)
-        end
+      if Puppet::Util::Log.sendlevel?(:info)
+        warn_default_section(options[:section]) if @default_section
+        report_section_and_environment(options[:section], Puppet.settings[:environment])
       end
 
-      # convert symbols to strings before formatting output
-      if render_all_settings
-        to_be_rendered = stringifyhash(to_be_rendered)
-      end
-      to_be_rendered
+      names = if args.empty? || args == ['all']
+                :all
+              else
+                args
+              end
+
+      Puppet.settings.stringify_settings(options[:section], names)
     end
 
     when_rendering :console do |to_be_rendered|
@@ -117,21 +94,6 @@ Puppet::Face.define(:config, '0.0.1') do
     end
   end
 
-  def stringifyhash(hash)
-    newhash = {}
-    hash.each do |key, val|
-      key = key.to_s
-      if val.is_a? Hash
-        newhash[key] = stringifyhash(val)
-      elsif val.is_a? Symbol
-        newhash[key] = val.to_s
-      else
-        newhash[key] = val
-      end
-    end
-    newhash
-  end
-
   def warn_default_section(section_name)
     messages = []
     messages << _("No section specified; defaulting to '%{section_name}'.") %

data/lib/puppet/face/facts.rb

@@ -81,7 +81,7 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
                     node: Puppet[:node_name_value],
                     server: server})
 
-      Puppet::Node::Facts.indirection.save(facts)
+      Puppet::Node::Facts.indirection.save(facts, nil, :environment => Puppet.lookup(:current_environment))
     end
   end
 end

data/lib/puppet/face/plugin.rb

@@ -41,8 +41,15 @@ Puppet::Face.define(:plugin, '0.0.1') do
     when_invoked do |options|
       remote_environment_for_plugins = Puppet::Node::Environment.remote(Puppet[:environment])
 
-      handler = Puppet::Configurer::PluginHandler.new()
-      handler.download_plugins(remote_environment_for_plugins)
+      pool = Puppet::Network::HTTP::Pool.new(Puppet[:http_keepalive_timeout])
+      Puppet.override(:http_pool => pool) do
+        begin
+          handler = Puppet::Configurer::PluginHandler.new()
+          handler.download_plugins(remote_environment_for_plugins)
+        ensure
+          pool.close
+        end
+      end
     end
 
     when_rendering :console do |value|

data/lib/puppet/module_tool/tar/mini.rb

@@ -1,7 +1,17 @@
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|
-      Archive::Tar::Minitar.unpack(reader, destdir, find_valid_files(reader)) do |action, name, stats|
+      # puppet doesn't have a hard dependency on minitar, so we
+      # can't be certain which version is installed. If it's 0.9
+      # or above then we can prevent minitar from fsync'ing each
+      # extracted file and directory, otherwise fallback to the
+      # old behavior
+      args = [reader, destdir, find_valid_files(reader)]
+      spec = Gem::Specification.find_by_name('minitar')
+      if spec && spec.version >= Gem::Version.new('0.9')
+        args << {:fsync => false}
+      end
+      Archive::Tar::Minitar.unpack(*args) do |action, name, stats|
         case action
         when :dir
           validate_entry(destdir, name)

data/lib/puppet/network/http/factory.rb

@@ -25,17 +25,7 @@ class Puppet::Network::HTTP::Factory
   def create_connection(site)
     Puppet.debug("Creating new connection for #{site}")
 
-    args = [site.host, site.port]
-
-    unless Puppet::Util::HttpProxy.no_proxy?(site)
-      if Puppet[:http_proxy_host] == "none"
-        args << nil << nil
-      else
-        args << Puppet[:http_proxy_host] << Puppet[:http_proxy_port]
-      end
-    end
-
-    http = Net::HTTP.new(*args)
+    http = Puppet::Util::HttpProxy.proxy(URI(site.addr))
     http.use_ssl = site.use_ssl?
     http.read_timeout = Puppet[:http_read_timeout]
     http.open_timeout = Puppet[:http_connect_timeout]

data/lib/puppet/parameter.rb

@@ -93,6 +93,14 @@ class Puppet::Parameter
       end
     end
 
+    def sensitive(value = nil, &block)
+      if block
+        define_method(:is_sensitive, &block)
+      else
+        define_method(:is_sensitive) do value end
+      end
+    end
+
     # Produces a documentation string.
     # If an enumeration of _valid values_ has been defined, it is appended to the documentation
     # for this parameter specified with the {desc} method.

data/lib/puppet/provider/file/posix.rb

@@ -8,6 +8,11 @@ Puppet::Type.type(:file).provide :posix do
   include Puppet::Util::Warnings
 
   require 'etc'
+  require 'puppet/util/selinux'
+
+  def self.post_resource_eval
+    Selinux.matchpathcon_fini if Puppet::Util::SELinux.selinux_support?
+  end
 
   def uid2name(id)
     return id.to_s if id.is_a?(Symbol) or id.is_a?(String)