puppet 6.4.3-universal-darwin → 6.4.4-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efd66006e59b9cd2b9b56cc3a7c45c53d7d220628ce57cdd75f9828f4152460d
-  data.tar.gz: ce31437de5092cb156e50ebac0666e5882a52dc7bd94b63b6302742d49df7269
+  metadata.gz: 1dd4ef7b5a057b03a738a7fa1539ff575df455bbfa76539725dc2180287b6ac1
+  data.tar.gz: 1d1046c2c733c7c94bc633ce95a21d02a7e4a94ded83b3ffd2c4210aa4e079b6
 SHA512:
-  metadata.gz: 3e4b7c4740e39e0d14cc12f84443c9660ab3d38c3f80b2fcd6441ca17a81a1731faa9b095d6f6a49ab506dcca86e471eb6fc0cb0a69ad7f2a2309eb54f9a357b
-  data.tar.gz: d3728e9a92e756a01beee0e66d7676d6a46c29f81215beb081df8ee2a0a8a7369ad1474b169954e7aacb2723734cc31e60ec69765116d234a280f43b478acb70
+  metadata.gz: 1a23a885b450a63b64cce6b168b88b58d949780bb8e261e2f5bab522860578dc33a3a7c8d29352c46002229d12292bbd486d5b79c3c7688cac5aea00ea8446da
+  data.tar.gz: 5d8bb617053c42a3b473ecfe95552641be348a44aa95ea7a021aec0e0c8a3d1a0f779d188a1ade227a7297ae714c6300143dd30f0017362e878d52b7b7eac8c6

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

@@ -23,8 +23,8 @@ group(:features) do
   gem 'hiera-eyaml', require: false
   gem 'hocon', '~> 1.0', require: false
   # requires native libshadow headers/libs
-  # gem 'libshadow', '~> 1.0', require: false, platforms: [:ruby]
-  gem 'minitar', '~> 0.6', require: false
+  #gem 'ruby-shadow', '~> 2.5', require: false, platforms: [:ruby]
+  gem 'minitar', '~> 0.9', require: false
   gem 'msgpack', '~> 1.2', require: false
   gem 'rdoc', '~> 6.0', require: false, platforms: [:ruby]
   # requires native augeas headers/libs

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.4.3)
+    puppet (6.4.4)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -15,20 +15,20 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     artifactory (2.8.2)
     ast (2.4.0)
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    facter (2.5.4)
+    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
@@ -46,32 +46,32 @@ GEM
     locale (2.1.2)
     memory_profiler (0.9.14)
     method_source (0.9.2)
-    minitar (0.8)
-    msgpack (1.3.0)
+    minitar (0.9)
+    msgpack (1.3.1)
     multi_json (1.13.1)
     mustache (1.1.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)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.1.1)
-    puppet-resource_api (1.8.4)
+    public_suffix (4.0.1)
+    puppet-resource_api (1.8.7)
       hocon (>= 1.0)
-    puppetserver-ca (1.3.1)
+    puppetserver-ca (1.4.0)
       facter (>= 2.0.1, < 4)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
-    rake (12.3.2)
+    rake (12.3.3)
     rdiscount (2.2.0.1)
-    rdoc (6.1.1)
+    rdoc (6.2.0)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
@@ -80,20 +80,20 @@ 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.6)
       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-mocks (3.8.1)
+    rspec-mocks (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+    rspec-support (3.8.3)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -103,7 +103,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)
     semantic_puppet (1.0.2)
@@ -126,7 +126,7 @@ DEPENDENCIES
   hocon (~> 1.0)
   json-schema (~> 2.0)
   memory_profiler
-  minitar (~> 0.6)
+  minitar (~> 0.9)
   msgpack (~> 1.2)
   packaging (~> 0.99)
   pry
@@ -149,4 +149,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.5
+   1.17.3

data/ext/project_data.yaml

@@ -44,7 +44,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: '~> 1.9.25'
@@ -54,7 +54,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

@@ -347,6 +347,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]
@@ -357,6 +359,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
     Puppet::Util::Log.newdestination(:console)
     cert_provider = Puppet::X509::CertProvider.new

data/lib/puppet/application/device.rb

@@ -238,6 +238,7 @@ Licensed under the Apache 2.0 License
     libdir = Puppet[:libdir]
     vardir = Puppet[:vardir]
     confdir = Puppet[:confdir]
+    ssldir = Puppet[:ssldir]
     certname = Puppet[:certname]
 
     env = Puppet::Node::Environment.remote(Puppet[:environment])
@@ -267,15 +268,23 @@ Licensed under the Apache 2.0 License
             port = ":#{device_url.port}" if device_url.port
 
             # override local $vardir and $certname
+            Puppet[:ssldir] = ::File.join(Puppet[:deviceconfdir], device.name, 'ssl')
             Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
             Puppet[:libdir] = options[:libdir] || ::File.join(Puppet[:devicedir], device.name, 'lib')
             Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
             Puppet[:certname] = device.name
             ssl_context = nil
 
+            # create device directory under $deviceconfdir
+            Puppet::FileSystem.dir_mkpath(Puppet[:ssldir]) unless Puppet::FileSystem.dir_exist?(Puppet[:ssldir])
+
             # this will reload and recompute default settings and create device-specific sub vardir
             Puppet.settings.use :main, :agent, :ssl
 
+            # Workaround for PUP-8736: store ssl certs outside the cache directory to prevent accidental removal and keep the old path as symlink
+            optssldir = File.join(Puppet[:confdir], 'ssl')
+            Puppet::FileSystem.symlink(Puppet[:ssldir], optssldir) unless Puppet::FileSystem.exist?(optssldir)
+
             unless options[:resource] || options[:facts] || options[:apply]
               # Since it's too complicated to fix properly in the default settings, we workaround for PUP-9642 here.
               # See https://github.com/puppetlabs/puppet/pull/7483#issuecomment-483455997 for details.
@@ -306,10 +315,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)
@@ -359,6 +368,7 @@ Licensed under the Apache 2.0 License
             Puppet[:libdir] = libdir
             Puppet[:vardir] = vardir
             Puppet[:confdir] = confdir
+            Puppet[:ssldir] = ssldir
             Puppet[:certname] = certname
           end
         end

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

@@ -572,6 +572,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,
@@ -1473,6 +1477,14 @@ EOT
         apply. You can see man pages by running `puppet <SUBCOMMAND> --help`,
         or read them online at https://puppet.com/docs/puppet/latest/man/."
     },
+    :deviceconfdir => {
+      :default  => "$confdir/devices",
+      :type     => :directory,
+      :mode     => "0750",
+      :owner    => "service",
+      :group    => "service",
+      :desc     => "The root directory of devices' $confdir.",
+    },
     :server => {
       :default => "puppet",
       :desc => "The puppet master server to which the puppet agent should connect.",

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