puppet 4.0.0 → 4.9.1

data/lib/puppet/environments.rb

@@ -38,6 +38,14 @@ module Puppet::Environments
         raise EnvironmentNotFound, name
       end
     end
+
+    def clear_all
+      root = Puppet.lookup(:root_environment) { nil }
+      unless root.nil?
+        root.instance_variable_set(:@static_catalogs, nil)
+        root.instance_variable_set(:@rich_data, nil)
+      end
+    end
   end
 
   # @!macro [new] loader_search_paths
@@ -107,7 +115,7 @@ module Puppet::Environments
     def get_conf(name)
       env = get(name)
       if env
-        Puppet::Settings::EnvironmentConf.static_for(env)
+        Puppet::Settings::EnvironmentConf.static_for(env, 0, Puppet[:static_catalogs], Puppet[:rich_data])
       else
         nil
       end
@@ -142,8 +150,10 @@ module Puppet::Environments
     include EnvironmentLoader
 
     def initialize(environment_dir, global_module_path)
-      @environment_dir = environment_dir
-      @global_module_path = global_module_path
+      @environment_dir =  Puppet::FileSystem.expand_path(environment_dir)
+      @global_module_path = global_module_path ?
+        global_module_path.map { |p| Puppet::FileSystem.expand_path(p) } :
+        nil
     end
 
     # Generate an array of directory loaders from a path string.
@@ -190,15 +200,16 @@ module Puppet::Environments
 
     private
 
-    def create_environment(name, setting_values = nil)
+    def create_environment(name)
       env_symbol = name.intern
       setting_values = Puppet.settings.values(env_symbol, Puppet.settings.preferred_run_mode)
-      Puppet::Node::Environment.create(
+      env = Puppet::Node::Environment.create(
         env_symbol,
         Puppet::Node::Environment.split_path(setting_values.interpolate(:modulepath)),
         setting_values.interpolate(:manifest),
         setting_values.interpolate(:config_version)
       )
+      env
     end
 
     def valid_directory?(envdir)
@@ -257,6 +268,9 @@ module Puppet::Environments
       nil
     end
 
+    def clear_all
+      @loaders.each {|loader| loader.clear_all}
+    end
   end
 
   class Cached
@@ -282,10 +296,29 @@ module Puppet::Environments
       @cache_expiration_service || DefaultCacheExpirationService.new
     end
 
+    # Returns the end of time (the next Mesoamerican Long Count cycle-end after 2012 (5125+2012) = 7137,
+    # of for a 32 bit machine using Ruby < 1.9.3, the year 2038.
+    def self.end_of_time
+      begin
+        Time.gm(7137)
+      rescue ArgumentError
+        Time.gm(2038)
+      end
+    end
+
+    END_OF_TIME = end_of_time
+    START_OF_TIME = Time.gm(1)
+
     def initialize(loader)
       @loader = loader
-      @cache = {}
       @cache_expiration_service = Puppet::Environments::Cached.cache_expiration_service
+      @cache = {}
+
+      # Holds expiration times in sorted order - next to expire is first
+      @expirations = SortedSet.new
+
+      # Infinity since it there are no entries, this is a cache of the first to expire time
+      @next_expiration = END_OF_TIME
     end
 
     # @!macro loader_list
@@ -300,15 +333,34 @@ module Puppet::Environments
 
     # @!macro loader_get
     def get(name)
-      evict_if_expired(name)
+      # Aggressively evict all that has expired
+      # This strategy favors smaller memory footprint over environment
+      # retrieval time.
+      clear_all_expired
       if result = @cache[name]
+        # found in cache
         return result.value
       elsif (result = @loader.get(name))
-        @cache[name] = entry(result)
+        # environment loaded, cache it
+        cache_entry = entry(result)
+        @cache_expiration_service.created(result)
+        add_entry(name, cache_entry)
         result
       end
     end
 
+    # Adds a cache entry to the cache
+    def add_entry(name, cache_entry)
+      Puppet.debug {"Caching environment '#{name}' #{cache_entry.label}"}
+      @cache[name] = cache_entry
+      expires = cache_entry.expires
+      @expirations.add(expires)
+      if @next_expiration > expires
+        @next_expiration = expires
+      end
+    end
+    private :add_entry
+
     # Clears the cache of the environment with the given name.
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear(name)
@@ -318,7 +370,27 @@ module Puppet::Environments
     # Clears all cached environments.
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear_all()
+      super
       @cache = {}
+      @expirations.clear
+      @next_expiration = END_OF_TIME
+    end
+
+    # Clears all environments that have expired, either by exceeding their time to live, or
+    # through an explicit eviction determined by the cache expiration service.
+    #
+    def clear_all_expired()
+      t = Time.now
+      return if t < @next_expiration && ! @cache.any? {|name, _| @cache_expiration_service.expired?(name.to_sym) }
+      to_expire = @cache.select { |name, entry| entry.expires < t || @cache_expiration_service.expired?(name.to_sym) }
+      to_expire.each do |name, entry|
+        Puppet.debug {"Evicting cache entry for environment '#{name}'"}
+        @cache_expiration_service.evicted(name)
+        clear(name)
+        @expirations.delete(entry.expires)
+        Puppet.settings.clear_environment_settings(name)
+      end
+      @next_expiration = @expirations.first || END_OF_TIME
     end
 
     # This implementation evicts the cache, and always gets the current
@@ -337,9 +409,7 @@ module Puppet::Environments
     # Creates a suitable cache entry given the time to live for one environment
     #
     def entry(env)
-      @cache_expiration_service.created(env)
       ttl = (conf = get_conf(env.name)) ? conf.environment_timeout : Puppet.settings.value(:environment_timeout)
-      Puppet.debug {"Caching environment '#{env.name}' (cache ttl: #{ttl})"}
       case ttl
       when 0
         NotCachedEntry.new(env)     # Entry that is always expired (avoids syscall to get time)
@@ -373,6 +443,14 @@ module Puppet::Environments
       def expired?
         false
       end
+
+      def label
+        ""
+      end
+
+      def expires
+        END_OF_TIME
+      end
     end
 
     # Always evicting entry
@@ -380,6 +458,14 @@ module Puppet::Environments
       def expired?
         true
       end
+
+      def label
+        "(ttl = 0 sec)"
+      end
+
+      def expires
+        START_OF_TIME
+      end
     end
 
     # Time to Live eviction policy entry
@@ -387,11 +473,20 @@ module Puppet::Environments
       def initialize(value, ttl_seconds)
         super value
         @ttl = Time.now + ttl_seconds
+        @ttl_seconds = ttl_seconds
       end
 
       def expired?
         Time.now > @ttl
       end
+
+      def label
+        "(ttl = #{@ttl_seconds} sec)"
+      end
+
+      def expires
+        @ttl
+      end
     end
   end
 end

data/lib/puppet/error.rb

@@ -54,8 +54,34 @@ module Puppet
     include ExternalFileError
   end
 
+  # Contains an issue code and can be annotated with an environment and a node
+  class ParseErrorWithIssue < Puppet::ParseError
+    attr_reader :issue_code, :basic_message
+    attr_accessor :environment, :node
+
+    # @param message [String] The error message
+    # @param file [String] The path to the file where the error was found
+    # @param line [Integer] The line in the file
+    # @param pos [Integer] The position on the line
+    # @param original [Exception] Original exception
+    # @param issue_code [Symbol] The issue code
+    #
+    def initialize(message, file=nil, line=nil, pos=nil, original=nil, issue_code= nil)
+      super(message, file, line, pos, original)
+      @issue_code = issue_code
+      @basic_message = message
+    end
+
+    def to_s
+      msg = super
+      msg = "Could not parse for environment #{environment}: #{msg}" if environment
+      msg = "#{msg} on node #{node}" if node
+      msg
+    end
+  end
+
   # An error that already contains location information in the message text
-  class PreformattedError < Puppet::ParseError
+  class PreformattedError < Puppet::ParseErrorWithIssue
   end
 
   # An error class for when I don't know what happened.  Automatically
@@ -67,4 +93,8 @@ module Puppet
   class MissingCommand < Puppet::Error
   end
 
+  # Raised when we failed to acquire a lock
+  class LockError < Puppet::Error
+  end
+
 end

data/lib/puppet/external/dot.rb

@@ -8,7 +8,7 @@
 
 module DOT
 
-  # These glogal vars are used to make nice graph source.
+  # These global vars are used to make nice graph source.
 
   $tab  = '    '
   $tab2 = $tab * 2

data/lib/puppet/face/ca.rb

@@ -178,7 +178,10 @@ Puppet::Face.define(:ca, '0.1.0') do
       Puppet::SSL::Host.ca_location = :only
 
       begin
-        ca.sign(host, options[:allow_dns_alt_names])
+        signing_options = options.select { |k,_|
+          [:allow_dns_alt_names, :allow_authorization_extensions].include?(k)
+        }
+        ca.sign(host, signing_options)
       rescue ArgumentError => e
         if e.to_s =~ /Could not find certificate request/
           e.to_s
@@ -251,4 +254,6 @@ Puppet::Face.define(:ca, '0.1.0') do
       end
     end
   end
+
+  deprecate
 end

data/lib/puppet/face/catalog.rb

@@ -123,7 +123,7 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
 
       Puppet::Resource::Catalog.indirection.terminus_class = :yaml
       Puppet::Face[:catalog, "0.0.1"].save(catalog)
-      Puppet.notice "Saved catalog for #{Puppet[:certname]} to yaml"
+      Puppet.notice "Saved catalog for #{Puppet[:certname]} to #{Puppet::Resource::Catalog.indirection.terminus.path(Puppet[:certname])}"
       nil
     end
   end

data/lib/puppet/face/certificate.rb

@@ -77,6 +77,10 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
       # them. Otherwise, they will default to the config file setting iff this
       # cert is for the host we're running on.
 
+      unless Puppet::FileSystem.exist?(Puppet[:hostcert])
+        Puppet.push_context({:ssl_host => host})
+      end
+
       host.generate_certificate_request(:dns_alt_names => options[:dns_alt_names])
     end
   end
@@ -129,7 +133,9 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
           raise ArgumentError, "This process is not configured as a certificate authority"
         end
 
-        ca.sign(name, options[:allow_dns_alt_names])
+        signing_options = {allow_dns_alt_names: options[:allow_dns_alt_names]}
+
+        ca.sign(name, signing_options)
       end
     end
   end

data/lib/puppet/face/certificate_request.rb

@@ -51,4 +51,6 @@ Puppet::Indirector::Face.define(:certificate_request, '0.0.1') do
 
   get_action(:save).summary "API only: submit a certificate signing request."
   get_action(:save).arguments "<x509_CSR>"
+
+  deprecate
 end

data/lib/puppet/face/certificate_revocation_list.rb

@@ -51,4 +51,6 @@ Puppet::Indirector::Face.define(:certificate_revocation_list, '0.0.1') do
 
   deactivate_action(:search)
   deactivate_action(:save)
+
+  deprecate
 end

data/lib/puppet/face/config.rb

@@ -9,7 +9,7 @@ Puppet::Face.define(:config, '0.0.1') do
 
   description "This subcommand can inspect and modify settings from Puppet's
     'puppet.conf' configuration file. For documentation about individual settings,
-    see http://docs.puppetlabs.com/references/latest/configuration.html."
+    see https://docs.puppetlabs.com/puppet/latest/reference/configuration.html."
 
   option "--section SECTION_NAME" do
     default_to { "main" }
@@ -108,7 +108,7 @@ Puppet::Face.define(:config, '0.0.1') do
     when_invoked do |name, value, options|
       path = Puppet::FileSystem.pathname(Puppet.settings.which_configuration_file)
       Puppet::FileSystem.touch(path)
-      Puppet::FileSystem.open(path, nil, 'r+') do |file|
+      Puppet::FileSystem.open(path, nil, 'r+:UTF-8') do |file|
         Puppet::Settings::IniFile.update(file) do |config|
           config.set(options[:section], name, value)
         end

data/lib/puppet/face/epp.rb

@@ -62,6 +62,8 @@ Puppet::Face.define(:epp, '0.0.1') do
     EOT
     when_invoked do |*args|
       options = args.pop
+      # pass a dummy node, as facts are not needed for validation
+      options[:node] = node = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", {}))
       compiler = create_compiler(options)
 
       status = true # no validation error yet
@@ -72,7 +74,7 @@ Puppet::Face.define(:epp, '0.0.1') do
           status &&= tmp
         else
           # This is not an error since a validate of all files in an empty
-          # directry should not be treated as a failed validation.
+          # directory should not be treated as a failed validation.
           Puppet.notice "No template specified. No action taken"
         end
       end
@@ -115,10 +117,10 @@ Puppet::Face.define(:epp, '0.0.1') do
       If no arguments are given, the stdin is read (unless it is attached to a terminal)
 
       If multiple templates are given, they are separated with a header indicating the
-      name of the template. This can be surpressed with the option --no-header.
-      The option --[no-]header has no effect whe a single template is dumped.
+      name of the template. This can be suppressed with the option --no-header.
+      The option --[no-]header has no effect when a single template is dumped.
 
-      When debugging the epp parser itself, it may be useful to surpress the valiation
+      When debugging the epp parser itself, it may be useful to suppress the validation
       step with the `--no-validate` option to observe what the parser produced from the
       given source.
 
@@ -141,6 +143,8 @@ Puppet::Face.define(:epp, '0.0.1') do
     when_invoked do |*args|
       require 'puppet/pops'
       options = args.pop
+      # pass a dummy node, as facts are not needed for dump
+      options[:node] = node = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", {}))
       options[:header] = options[:header].nil? ? true : options[:header]
       options[:validate] = options[:validate].nil? ? true : options[:validate]
 
@@ -172,7 +176,7 @@ Puppet::Face.define(:epp, '0.0.1') do
 
         show_filename = templates.count > 1
         dumps = templates.each do |file|
-          buffer.print dump_parse(File.read(file), file, options, show_filename)
+          buffer.print dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options, show_filename)
         end
 
         if !missing_files.empty?
@@ -224,8 +228,12 @@ Puppet::Face.define(:epp, '0.0.1') do
       showing the name of the template before the output. The header output can be turned off with
       `--no-header`. This also concatenates the template results without any added newline separators.
 
-      Facts for the simulated node can be feed to the rendering process by referencing a .yaml file
-      with facts using the --facts option. (Values can be obtained in yaml format directly from
+      Facts from the node where the command is being run are used by default.args Facts can be obtained
+      for other nodes if they have called in, and reported their facts by using the `--node <nodename>`
+      flag.
+
+      Overriding node facts as well as additional facts can be given in a .yaml or .json file and referencing
+      it with the --facts option. (Values can be obtained in yaml format directly from
       `facter`, or from puppet for a given node). Note that it is not possible to simulate the
       reserved variable name `$facts` in any other way.
 
@@ -238,7 +246,7 @@ Puppet::Face.define(:epp, '0.0.1') do
 
       When designing EPP templates, it is strongly recommended to define all template arguments
       in the template, and to give them in a hash when calling `epp` or `inline_epp` and to use
-      as few global variables as possible, preferrably only the $facts hash. This makes templates
+      as few global variables as possible, preferably only the $facts hash. This makes templates
       more free standing and are easier to reuse, and to test.
     EOT
 
@@ -278,6 +286,10 @@ Puppet::Face.define(:epp, '0.0.1') do
           $ puppet epp render -e '<% $facts[osfamily] %>' --facts data.yaml
     EOT
 
+    option("--node <node_name>") do
+      summary "The name of the node for which facts are obtained. Defaults to facts for the local node."
+    end
+
     option "--e <source>" do
       default_to { nil }
       summary "Render one inline epp template given on the command line."
@@ -291,8 +303,8 @@ Puppet::Face.define(:epp, '0.0.1') do
       summary "A .pp or .yaml file that is processed to produce a hash of values for the template."
     end
 
-    option("--facts <yaml_file>") do
-      summary "A .yaml file containing a hash of facts made available in $facts"
+    option("--facts <facts_file>") do
+      summary "A .yaml or .json file containing a hash of facts made available in $facts and $trusted"
     end
 
     option("--[no-]header") do
@@ -444,16 +456,50 @@ Puppet::Face.define(:epp, '0.0.1') do
 
   # @api private
   def create_compiler(options)
-    fact_values = options[:facts] ? YAML.load_file(options[:facts]) : {}
-    node = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", fact_values))
+    if options[:node]
+      node = options[:node]
+    else
+      node = Puppet[:node_name_value]
+
+      # If we want to lookup the node we are currently on
+      # we must returning these settings to their default values
+      Puppet.settings[:facts_terminus] = 'facter'
+      Puppet.settings[:node_cache_terminus] = nil
+    end
+
+    unless node.is_a?(Puppet::Node)
+      node = Puppet::Node.indirection.find(node)
+      # Found node must be given the environment to use in some cases, use the one configured
+      # or given on the command line
+      node.environment = Puppet[:environment]
+    end
+
+    fact_file = options[:facts]
+
+    if fact_file
+      if fact_file.is_a?(Hash) # when used via the Face API
+        given_facts = fact_file
+      elsif fact_file.end_with?("json")
+        given_facts = JSON.parse(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
+      else
+        given_facts = YAML.load(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
+      end
+
+      unless given_facts.instance_of?(Hash)
+        raise "Incorrect formatted data in #{fact_file} given via the --facts flag"
+      end
+      # It is difficult to add to or modify the set of facts once the node is created
+      # as changes does not show up in parameters. Rather than manually patching up
+      # a node and risking future regressions, a new node is created from scratch
+      node = Puppet::Node.new(node.name, :facts => Puppet::Node::Facts.new("facts", node.facts.values.merge(given_facts)))
+      node.environment = Puppet[:environment]
+      node.merge(node.facts.values)
+    end
+
     compiler = Puppet::Parser::Compiler.new(node)
     # configure compiler with facts and node related data
     # Set all global variables from facts
-    fact_values.each {|param, value| compiler.topscope[param] = value }
-    # Configured trusted data (even if there are none)
-    compiler.topscope.set_trusted(node.trusted_data)
-    # Set the facts hash
-    compiler.topscope.set_facts(fact_values)
+    compiler.send(:set_node_parameters)
 
     # pretend that the main class (named '') has been evaluated
     # since it is otherwise not possible to resolve top scope variables

data/lib/puppet/face/file.rb

@@ -44,4 +44,7 @@ Puppet::Indirector::Face.define(:file, '0.0.1') do
   deactivate_action(:destroy)
 
   set_indirection_name :file_bucket_file
+
+  # The file face is deprecated
+  deprecate
 end

data/lib/puppet/face/generate.rb

@@ -0,0 +1,64 @@
+require 'puppet/face'
+require 'puppet/generate/type'
+
+# Create the Generate face
+Puppet::Face.define(:generate, '0.1.0') do
+  copyright 'Puppet Inc.', 2016
+  license   'Apache 2 license; see COPYING'
+
+  summary 'Generates Puppet code from Ruby definitions.'
+
+  action(:types) do
+    summary 'Generates Puppet code for custom types'
+
+    description <<-'EOT'
+      Generates definitions for custom resource types using Puppet code.
+
+      Types defined in Puppet code can be used to isolate custom type definitions
+      between different environments.
+    EOT
+
+    examples <<-'EOT'
+      Generate Puppet type definitions for all custom resource types in the current environment:
+
+          $ puppet generate types
+
+      Generate Puppet type definitions for all custom resource types in the specified environment:
+
+          $ puppet generate types --environment development
+    EOT
+
+    option '--format <format>' do
+      summary 'The generation output format to use. Supported formats: pcore.'
+      default_to { 'pcore' }
+
+      before_action do |_, _, options|
+        raise ArgumentError, "'#{options[:format]}' is not a supported format for type generation." unless ['pcore'].include?(options[:format])
+      end
+    end
+
+    option '--force' do
+      summary 'Forces the generation of output files (skips up-to-date checks).'
+      default_to { false }
+    end
+
+    when_invoked do |options|
+      generator = Puppet::Generate::Type
+      inputs = generator.find_inputs(options[:format].to_sym)
+      environment = Puppet.lookup(:current_environment)
+
+      # get the common output directory (in <envroot>/.resource_types) - create it if it does not exists
+      # error if it exists and is not a directory
+      #
+      path_to_env = environment.configuration.path_to_env
+      outputdir = File.join(path_to_env, '.resource_types')
+      if Puppet::FileSystem.exist?(outputdir) && !Puppet::FileSystem.directory?(outputdir)
+        raise ArgumentError, "The output directory '#{outputdir}' exists and is not a directory"
+      end
+      Puppet::FileSystem::mkpath(outputdir)
+
+      generator.generate(inputs, outputdir, options[:force])
+      nil
+    end
+  end
+end

data/lib/puppet/face/help/face.erb

@@ -1,4 +1,7 @@
 <%# encoding: UTF-8%>
+<% if face.deprecated? -%>
+<%= "Warning: 'puppet #{face.name}' is deprecated and will be removed in a future release." %>
+<% end %>
 <% if face.synopsis -%>
 USAGE: <%= face.synopsis %>
 

data/lib/puppet/face/help/man.erb

@@ -23,7 +23,7 @@ settings, so you can specify `--server <servername>`, or
 `--run_mode <runmode>` as an argument.
 
 See the configuration file documentation at
-<http://docs.puppetlabs.com/references/stable/configuration.html> for the
+<https://docs.puppetlabs.com/puppet/latest/reference/configuration.html> for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 `--genconfig`.