puppet 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54142084fb822aa85a40f5e383869469ec2b3d8be722ce8c32ce7837c81d4b6
-  data.tar.gz: 9e9769a816524a8ec54392fcbca962bf08d37fe285f69b5fcbd43d765f33a666
+  metadata.gz: 24468e78543d7934d7931ecb07ae2cdf6043b6b14778be928945b17908146484
+  data.tar.gz: 8d61028d09e73a864d3eaa23991c0a1ba2aaa1c33457f9401380892e0e5b06fa
 SHA512:
-  metadata.gz: 49f0b565d47831d73b95d6ccd6616febab630c49985ec7a8cca488e80f5830478952a50efbb5876e4b75506a985d2f56f2b658394e223b1218c941417823681c
-  data.tar.gz: fd573546cde9cc6606c7808d1a437bfb9e341d46b2f95370a27ce3a0fa35e370f87369bf62f3368b2447c2c4ed61b27e296abf7d9954a683e441ee9c3dc8754b
+  metadata.gz: 4cffd5ea8418f0f1ddb36506a9eb2302eaafeaa32b3b559ece1906aee14146bcbfdda1c7769d159f3af75e6b0875d52bf8d11ade9d48b7286e71aac35af2ee60
+  data.tar.gz: d4eeeb7a6097f25320f74dbbd8b0339fe054a2ec5b5c833801f3f98a6ceeafe04ca7666f651c981f3de85f20f21dff9e1697ba4c2b15fcd45b7898c44b1456fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.0.0)
+    puppet (6.0.1)
       CFPropertyList (~> 2.2)
       facter (>= 2.0.1, < 4)
       fast_gettext (~> 1.1.2)
@@ -33,7 +33,7 @@ GEM
       gettext (>= 3.0.2)
       locale
     hashdiff (0.3.7)
-    hiera (3.4.4)
+    hiera (3.4.5.13)
     hiera-eyaml (2.1.0)
       highline (~> 1.6.19)
       trollop (~> 2.0)
@@ -64,7 +64,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    puppet-resource_api (1.5.0)
+    puppet-resource_api (1.6.0)
       hocon (>= 1.0)
     puppetserver-ca (0.7.0)
       facter (>= 2.0.1, < 4)
@@ -153,4 +153,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.2
+   1.16.5

data/lib/puppet/application/apply.rb

@@ -173,6 +173,11 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     else
       main
     end
+  ensure
+    if @profiler
+      Puppet::Util::Profiler.remove_profiler(@profiler)
+      @profiler.shutdown
+    end
   end
 
   def apply
@@ -189,53 +194,15 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
   end
 
   def main
-    # Set our code or file to use.
-    if options[:code] or command_line.args.length == 0
-      Puppet[:code] = options[:code] || STDIN.read
-    else
-      manifest = command_line.args.shift
-      raise _("Could not find file %{manifest}") % { manifest: manifest } unless Puppet::FileSystem.exist?(manifest)
-      Puppet.warning(_("Only one file can be applied per run.  Skipping %{files}") % { files: command_line.args.join(', ') }) if command_line.args.size > 0
-    end
-
-    # splay if needed
-    splay
+    manifest          = get_manifest() # Get either a manifest or nil if apply should use content of Puppet[:code]
+    splay                              # splay if needed
+    facts             = get_facts()    # facts or nil
+    node              = get_node()     # node or error
+    apply_environment = get_configured_environment(node, manifest)
 
-    unless Puppet[:node_name_fact].empty?
-      # Collect our facts.
-      unless facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
-        raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] }
-      end
-
-      Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
-      facts.name = Puppet[:node_name_value]
-    end
-
-    # Find our Node
-    unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
-      raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] }
-    end
-
-    configured_environment = node.environment || Puppet.lookup(:current_environment)
-
-    apply_environment = manifest ?
-      configured_environment.override_with(:manifest => manifest) :
-      configured_environment
-
-    # Modify the node descriptor to use the special apply_environment.
-    # It is based on the actual environment from the node, or the locally
-    # configured environment if the node does not specify one.
-    # If a manifest file is passed on the command line, it overrides
-    # the :manifest setting of the apply_environment.
-    node.environment = apply_environment
-
-    #TRANSLATORS "puppet apply" is a program command and should not be translated
+    # TRANSLATORS "puppet apply" is a program command and should not be translated
     Puppet.override({:current_environment => apply_environment}, _("For puppet apply")) do
-      # Merge in the facts.
-      node.merge(facts.values) if facts
-
-      # Add server facts so $server_facts[environment] exists when doing a puppet apply
-      node.add_server_facts({})
+      configure_node_facts(node, facts)
 
       # Allow users to load the classes that puppet agent creates.
       if options[:loadclasses]
@@ -287,7 +254,6 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
             catalog.write_resource_file
           end
 
-          #exit_status = Puppet.override(:loaders => Puppet::Pops::Loaders.new(apply_environment)) { apply_catalog(catalog) }
           apply_catalog(catalog)
         end
         if not exit_status
@@ -302,12 +268,6 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
         exit(1)
       end
     end
-
-  ensure
-    if @profiler
-      Puppet::Util::Profiler.remove_profiler(@profiler)
-      @profiler.shutdown
-    end
   end
 
   # Enable all of the most common test options.
@@ -350,18 +310,98 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
   private
 
   def read_catalog(text)
-    format = Puppet::Resource::Catalog.default_format
-    begin
-      catalog = Puppet::Resource::Catalog.convert_from(format, text)
-    rescue => detail
-      raise Puppet::Error, _("Could not deserialize catalog from %{format}: %{detail}") % { format: format, detail: detail }, detail.backtrace
-    end
+    facts = get_facts()
+    node = get_node()
+    configured_environment = get_configured_environment(node)
+
+    # TRANSLATORS "puppet apply" is a program command and should not be translated
+    Puppet.override({:current_environment => configured_environment}, _("For puppet apply")) do
+      configure_node_facts(node, facts)
+
+      # NOTE: Does not set rich_data = true automatically (which would ensure always reading catalog with rich data
+      # on (seemingly the right thing to do)), but that would remove the ability to test what happens when a
+      # rich catalog is processed without rich_data being turned on.
+      format = Puppet::Resource::Catalog.default_format
+      begin
+        catalog = Puppet::Resource::Catalog.convert_from(format, text)
+      rescue => detail
+        raise Puppet::Error, _("Could not deserialize catalog from %{format}: %{detail}") % { format: format, detail: detail }, detail.backtrace
+      end
+      # Resolve all deferred values and replace them / mutate the catalog
+      Puppet::Pops::Evaluator::DeferredResolver.resolve_and_replace(node.facts, catalog)
 
-    catalog.to_ral
+      catalog.to_ral
+    end
   end
 
   def apply_catalog(catalog)
     configurer = Puppet::Configurer.new
     configurer.run(:catalog => catalog, :pluginsync => false)
   end
+
+  # Returns facts or nil
+  #
+  def get_facts()
+    facts = nil
+    unless Puppet[:node_name_fact].empty?
+      # Collect our facts.
+      unless facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
+        raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] }
+      end
+
+      Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
+      facts.name = Puppet[:node_name_value]
+    end
+    facts
+  end
+
+  # Returns the node or raises and error if node not found.
+  #
+  def get_node()
+    node = Puppet::Node.indirection.find(Puppet[:node_name_value])
+    raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] } unless node
+    node
+  end
+
+  # Returns either a manifest (filename) or nil if apply should use content of Puppet[:code]
+  #
+  def get_manifest()
+    manifest = nil
+    # Set our code or file to use.
+    if options[:code] or command_line.args.length == 0
+      Puppet[:code] = options[:code] || STDIN.read
+    else
+      manifest = command_line.args.shift
+      raise _("Could not find file %{manifest}") % { manifest: manifest } unless Puppet::FileSystem.exist?(manifest)
+      Puppet.warning(_("Only one file can be applied per run.  Skipping %{files}") % { files: command_line.args.join(', ') }) if command_line.args.size > 0
+    end
+    manifest
+  end
+
+  # Returns a configured environment, if a manifest is given it overrides what is configured for the environment
+  # specified by the node (or the current_environment found in the Puppet context).
+  # The node's resolved environment is modified  if needed.
+  #
+  def get_configured_environment(node, manifest = nil)
+    configured_environment = node.environment || Puppet.lookup(:current_environment)
+
+    apply_environment = manifest ?
+      configured_environment.override_with(:manifest => manifest) :
+      configured_environment
+
+    # Modify the node descriptor to use the special apply_environment.
+    # It is based on the actual environment from the node, or the locally
+    # configured environment if the node does not specify one.
+    # If a manifest file is passed on the command line, it overrides
+    # the :manifest setting of the apply_environment.
+    node.environment = apply_environment
+    apply_environment
+  end
+
+  # Mixes the facts into the node, and mixes in server facts
+  def configure_node_facts(node, facts)
+    node.merge(facts.values) if facts
+    # Add server facts so $server_facts[environment] exists when doing a puppet apply
+    node.add_server_facts({})
+  end
 end

data/lib/puppet/application/cert.rb

@@ -2,102 +2,6 @@ require 'puppet/application'
 
 class Puppet::Application::Cert < Puppet::Application
 
-  run_mode :master
-
-  attr_accessor :all, :ca, :digest, :signed
-
-  def subcommand
-    @subcommand
-  end
-
-  def subcommand=(name)
-    # Handle the nasty, legacy mapping of "clean" to "destroy".
-    sub = name.to_sym
-    @subcommand = (sub == :clean ? :destroy : sub)
-  end
-
-  option("--clean", "-c") do |arg|
-    self.subcommand = "destroy"
-  end
-
-  option("--all", "-a") do |arg|
-    @all = true
-  end
-
-  option("--digest DIGEST") do |arg|
-    @digest = arg
-  end
-
-  option("--signed", "-s") do |arg|
-    @signed = true
-  end
-
-  option("--debug", "-d") do |arg|
-    options[:debug] = true
-    set_log_level
-  end
-
-  option("--list", "-l") do |arg|
-    self.subcommand = :list
-  end
-
-  option("--revoke", "-r") do |arg|
-    self.subcommand = :revoke
-  end
-
-  option("--generate", "-g") do |arg|
-    self.subcommand = :generate
-  end
-
-  option("--sign", "-s") do |arg|
-    self.subcommand = :sign
-  end
-
-  option("--print", "-p") do |arg|
-    self.subcommand = :print
-  end
-
-  option("--verify", "-v") do |arg|
-    self.subcommand = :verify
-  end
-
-  option("--fingerprint", "-f") do |arg|
-    self.subcommand = :fingerprint
-  end
-
-  option("--reinventory") do |arg|
-    self.subcommand = :reinventory
-  end
-
-  option("--[no-]allow-dns-alt-names") do |value|
-    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 summary
     _("Manage certificates and requests (Disabled)")
   end
@@ -161,26 +65,12 @@ There are a couple important notes about previously-supported options.
 HELP
   end
 
-  def main
-    help
-  end
-
   def setup
     deprecate
   end
 
   def parse_options
-    # handle the bareword subcommand pattern.
-    result = super
-    unless self.subcommand then
-      if sub = self.command_line.args.shift then
-        self.subcommand = sub
-      else
-        puts help
-        exit
-      end
-    end
-
-    result
+    puts help
+    exit 1
   end
 end

data/lib/puppet/configurer.rb

@@ -16,7 +16,7 @@ class Puppet::Configurer
   # For benchmarking
   include Puppet::Util
 
-  attr_reader :compile_time, :environment
+  attr_reader :environment
 
   # Provide more helpful strings to the logging that the Agent does
   def self.to_s
@@ -42,7 +42,6 @@ class Puppet::Configurer
   # Initialize and load storage
   def init_storage
       Puppet::Util::Storage.load
-      @compile_time ||= Puppet::Util::Storage.cache(:configuration)[:compile_time]
   rescue => detail
     Puppet.log_exception(detail, _("Removing corrupt state file %{file}: %{detail}") % { file: Puppet[:statefile], detail: detail })
     begin
@@ -397,7 +396,7 @@ class Puppet::Configurer
       port = server[1] || Puppet[:masterport]
       begin
         http = Puppet::Network::HttpPool.http_ssl_instance(host, port)
-        response = http.get('/status/v1/simple')
+        response = http.get('/status/v1/simple/master')
         return [host, port] if response.is_a?(Net::HTTPOK)
 
         Puppet.debug(_("Puppet server %{host}:%{port} is unavailable: %{code} %{reason}") %

data/lib/puppet/defaults.rb

@@ -1410,7 +1410,20 @@ EOT
         with the running configuration.  In the case of puppet master,
         this file reflects the state discovered through interacting
         with clients."
-      },
+    },
+    :statettl => {
+      :default => "32d",
+      :type    => :ttl,
+      :desc    => "How long the Puppet agent should cache when a resource was last checked or synced.
+      #{AS_DURATION}
+      A value of `0` or `unlimited` will disable cache pruning.
+
+      This setting affects the usage of `schedule` resources, as the information
+      about when a resource was last checked (and therefore when it needs to be
+      checked again) is stored in the `statefile`. The `statettl` needs to be
+      large enough to ensure that a resource will not trigger multiple times
+      during a schedule due to its entry expiring from the cache."
+    },
     :transactionstorefile => {
       :default => "$statedir/transactionstore.yaml",
       :type => :file,

data/lib/puppet/etc.rb

@@ -103,6 +103,26 @@ module Puppet::Etc
       override_field_values_to_utf8(::Etc.getpwuid(id))
     end
 
+    # Etc::group returns a Ruby iterator that executes a block for
+    # each entry in the /etc/group file. The code-block is passed
+    # a Group struct. See getgrent above for more details.
+    def group
+      # The implementation here duplicates the logic in https://github.com/ruby/etc/blob/master/ext/etc/etc.c#L523-L537
+      # Note that we do not call ::Etc.group directly, because we
+      # want to use our wrappers for methods like getgrent, setgrent,
+      # endgrent, etc.
+      return getgrent unless block_given?
+
+      setgrent
+      begin
+        while cur_group = getgrent
+          yield cur_group
+        end
+      ensure
+        endgrent
+      end
+    end
+
     private
 
     # @api private