puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

data/lib/puppet/configurer.rb

@@ -90,7 +90,10 @@ class Puppet::Configurer
   end
 
   def get_facts(options)
-    download_plugins if options[:pluginsync]
+    if options[:pluginsync]
+      remote_environment_for_plugins = Puppet::Node::Environment.remote(@environment)
+      download_plugins(remote_environment_for_plugins)
+    end
 
     if Puppet::Resource::Catalog.indirection.terminus_class == :rest
       # This is a bit complicated.  We need the serialized and escaped facts,

data/lib/puppet/configurer/downloader.rb

@@ -30,10 +30,9 @@ class Puppet::Configurer::Downloader
   end
 
   def catalog
-    catalog = Puppet::Resource::Catalog.new
+    catalog = Puppet::Resource::Catalog.new("PluginSync", @environment)
     catalog.host_config = false
     catalog.add_resource(file)
-    catalog.environment = @environment
     catalog
   end
 
@@ -48,23 +47,25 @@ class Puppet::Configurer::Downloader
   require 'sys/admin' if Puppet.features.microsoft_windows?
 
   def default_arguments
-    {
+    defargs = {
       :path => path,
       :recurse => true,
       :source => source,
+      :source_permissions => :ignore,
       :tag => name,
       :purge => true,
       :force => true,
       :backup => false,
       :noop => false
-    }.merge(
-      Puppet.features.microsoft_windows? ? {
-        :source_permissions => :ignore
-      } :
-      {
-        :owner => Process.uid,
-        :group => Process.gid
-      }
-    )
+    }
+    if !Puppet.features.microsoft_windows?
+      defargs.merge!(
+        {
+          :owner => Process.uid,
+          :group => Process.gid
+        }
+      )
+    end
+    return defargs
   end
 end

data/lib/puppet/configurer/plugin_handler.rb

@@ -3,13 +3,13 @@
 # easier to test.
 module Puppet::Configurer::PluginHandler
   # Retrieve facts from the central server.
-  def download_plugins
+  def download_plugins(environment)
     plugin_downloader = Puppet::Configurer::Downloader.new(
       "plugin",
       Puppet[:plugindest],
       Puppet[:pluginsource],
       Puppet[:pluginsignore],
-      @environment
+      environment
     )
     if Puppet.features.external_facts?
        plugin_fact_downloader = Puppet::Configurer::Downloader.new(
@@ -17,7 +17,7 @@ module Puppet::Configurer::PluginHandler
           Puppet[:pluginfactdest],
           Puppet[:pluginfactsource],
           Puppet[:pluginsignore],
-          @environment
+          environment
        )
        plugin_fact_downloader.evaluate
     end

data/lib/puppet/context.rb

@@ -3,6 +3,10 @@
 # and cannot be changed; however a child context can be created, using
 # {#override}, that provides a different value.
 #
+# When binding a {Proc}, the proc is called when the value is looked up, and the result
+# is memoized for subsequent lookups. This provides a lazy mechanism that can be used to
+# delay expensive production of values until they are needed.
+#
 # @api private
 class Puppet::Context
   require 'puppet/context/trusted_information'
@@ -36,7 +40,8 @@ class Puppet::Context
   # @api private
   def lookup(name, &block)
     if @table.include?(name)
-      @table[name]
+      value = @table[name]
+      value.is_a?(Proc) ? (@table[name] = value.call) : value
     elsif block
       block.call
     else

data/lib/puppet/defaults.rb

@@ -52,6 +52,12 @@ module Puppet
         :owner    => "service",
         :group    => "service",
         :desc     => "The directory in which to store log files",
+    },
+    :log_level => {
+      :default    => 'notice',
+      :type       => :enum,
+      :values     => ["debug","info","notice","warning","err","alert","emerg","crit"],
+      :desc       => "Default logging level",
     }
   )
 
@@ -198,8 +204,13 @@ module Puppet
     },
     :environmentpath => {
       :default => "",
-      :desc    => "A search path for environment directories, as a list of directories separated by the system
-        path separator character.",
+      :desc    => "A search path for directory environments, as a list of directories
+        separated by the system path separator character. (The POSIX path separator
+        is ':', and the Windows path separator is ';'.)
+
+        This setting must have a value set to enable **directory environments.** The
+        recommended value is `$confdir/environments`. For more details, see
+        http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
       :type    => :path,
     },
     :diff_args => {
@@ -344,6 +355,12 @@ module Puppet
       configuration files.  This timeout determines how quickly Puppet checks whether
       a file (such as manifests or templates) has changed on disk. #{AS_DURATION}",
     },
+    :environment_timeout => {
+      :default    => "5s",
+      :type       => :ttl,
+      :desc       => "The time to live for a cached environment. The time is either given #{AS_DURATION}, or
+      the word 'unlimited' which causes the environment to be cached until the master is restarted."
+    },
     :queue_type => {
       :default    => "stomp",
       :desc       => "Which type of queue to use for asynchronous processing.",
@@ -392,7 +409,11 @@ module Puppet
       :desc       => "How to determine the configuration version.  By default, it will be the
       time that the configuration is parsed, but you can provide a shell script to override how the
       version is determined.  The output of this script will be added to every log message in the
-      reports, allowing you to correlate changes on your hosts to the source version on the server.",
+      reports, allowing you to correlate changes on your hosts to the source version on the server.
+
+      Setting a global value for config_version in puppet.conf is deprecated. Please set a
+      per-environment value in environment.conf instead. For more info, see
+      http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
     },
     :zlib => {
         :default  => true,
@@ -437,7 +458,7 @@ module Puppet
   )
   Puppet.define_settings(:module_tool,
     :module_repository  => {
-      :default  => 'https://forge.puppetlabs.com',
+      :default  => 'https://forgeapi.puppetlabs.com',
       :desc     => "The module repository",
     },
     :module_working_dir => {
@@ -680,6 +701,13 @@ EOT
       :type     => :duration,
       :desc     => "The window of time leading up to a certificate's expiration that a notification
         will be logged. This applies to CA, master, and agent certificates. #{AS_DURATION}"
+    },
+    :digest_algorithm => {
+        :default  => 'md5',
+        :type     => :enum,
+        :values => ["md5", "sha256"],
+        :desc     => 'Which digest algorithm to use for file resources and the filebucket.
+                      Valid values are md5, sha256. Default is md5.',
     }
   )
 
@@ -867,14 +895,22 @@ EOT
     :manifestdir => {
       :default    => "$confdir/manifests",
       :type       => :directory,
-      :desc       => "Where puppet master looks for its manifests.",
+      :desc       => "Used to build the default value of the `manifest` setting. Has no other purpose.
+
+        This setting is deprecated."
     },
     :manifest => {
       :default    => "$manifestdir/site.pp",
       :type       => :file_or_directory,
-      :desc       => "The entry-point manifest file for puppet master or a directory of manifests
-        to be evaluated in alphabetical order. Puppet manages this path as a directory
-        if it exists or if the path ends with a / or \\.",
+      :desc       => "The entry-point manifest for puppet master. This can be one file
+        or a directory of manifests to be evaluated in alphabetical order. Puppet manages
+        this path as a directory if one exists or if the path ends with a / or \\.
+
+        Setting a global value for `manifest` in puppet.conf is deprecated. Please use
+        directory environments instead. If you need to use something other than the
+        environment's `manifests` directory as the main manifest, you can set
+        `manifest` in environment.conf. For more info, see
+        http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
     },
     :code => {
       :default    => "",
@@ -938,15 +974,30 @@ EOT
     :basemodulepath => {
       :default => "$confdir/modules#{File::PATH_SEPARATOR}/usr/share/puppet/modules",
       :type => :path,
-      :desc => "The base non-environment specific search path for modules, included
-      also in all directory environment and default legacy environment modulepaths.",
+      :desc => "The search path for **global** modules. Should be specified as a
+        list of directories separated by the system path separator character. (The
+        POSIX path separator is ':', and the Windows path separator is ';'.)
+
+        If you are using directory environments, these are the modules that will
+        be used by _all_ environments. Note that the `modules` directory of the active
+        environment will have priority over any global directories. For more info, see
+        http://docs.puppetlabs.com/puppet/latest/reference/environments.html
+
+        This setting also provides the default value for the deprecated `modulepath`
+        setting, which is used when directory environments are disabled.",
     },
     :modulepath => {
       :default => "$basemodulepath",
       :type => :path,
       :desc => "The search path for modules, as a list of directories separated by the system
         path separator character. (The POSIX path separator is ':', and the
-        Windows path separator is ';'.)",
+        Windows path separator is ';'.)
+
+        Setting a global value for `modulepath` in puppet.conf is deprecated. Please use
+        directory environments instead. If you need to use something other than the
+        default modulepath of `<ACTIVE ENVIRONMENT'S MODULES DIR>:$basemodulepath`,
+        you can set `modulepath` in environment.conf. For more info, see
+        http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
     },
     :ssl_client_header => {
       :default    => "HTTP_X_CLIENT_DN",
@@ -1772,7 +1823,9 @@ EOT
         :default  => "$vardir/templates",
         :type     => :directory,
         :desc     => "Where Puppet looks for template files.  Can be a list of colon-separated
-          directories.",
+          directories.
+
+          This setting is deprecated. Please put your templates in modules instead."
     },
 
     :allow_variables_with_dashes => {
@@ -1833,6 +1886,23 @@ EOT
         Available Since Puppet 3.5.
       EOT
     },
+   :biff => {
+     :default => false,
+     :type => :boolean,
+     :hook => proc do |value|
+       if Puppet.settings[:parser] != 'future'
+         Puppet.settings.override_default(:parser, 'future')
+       end
+       if Puppet.settings[:evaluator] != 'future'
+         Puppet.settings.override_default(:evaluator, 'future')
+       end
+     end,
+     :desc => <<-EOT
+       Turns on Biff the catalog builder, future parser, and future evaluator.
+       This is an experimental feature - and this setting may go away before
+       release of Pupet 3.6.
+     EOT
+   },
    :max_errors => {
      :default => 10,
      :desc => <<-'EOT'

data/lib/puppet/environments.rb

@@ -31,6 +31,15 @@ module Puppet::Environments
   #   @param name [String,Symbol] The name of environment to find
   #   @return [Puppet::Node::Environment, nil] the requested environment or nil
   #     if it wasn't found
+  #
+  # @!macro [new] loader_get_conf
+  #   Attempt to obtain the initial configuration for the environment.  Not all
+  #   loaders can provide this.
+  #
+  #   @param name [String,Symbol] The name of the environment whose configuration
+  #     we are looking up
+  #   @return [Puppet::Setting::EnvironmentConf, nil] the configuration for the
+  #     requested environment, or nil if not found or no configuration is available
 
   # A source of pre-defined environments.
   #
@@ -58,6 +67,19 @@ module Puppet::Environments
         env.name == name.intern
       end
     end
+
+    # Returns a basic environment configuration object tied to the environment's
+    # implementation values.  Will not interpolate.
+    #
+    # @!macro loader_get_conf
+    def get_conf(name)
+      env = get(name)
+      if env
+        Puppet::Settings::EnvironmentConf.static_for(env)
+      else
+        nil
+      end
+    end
   end
 
   # A source of unlisted pre-defined environments.
@@ -113,6 +135,14 @@ module Puppet::Environments
     def get(name)
       Puppet::Node::Environment.new(name)
     end
+
+    # @note we could return something here, but since legacy environments
+    #   are deprecated, there is no point.
+    #
+    # @!macro loader_get_conf
+    def get_conf(name)
+      nil
+    end
   end
 
   # Reads environments from a directory on disk. Each environment is
@@ -131,7 +161,7 @@ module Puppet::Environments
 
     # Generate an array of directory loaders from a path string.
     # @param path [String] path to environment directories
-    # @param global_module_path [String] the global modulepath setting
+    # @param global_module_path [Array<String>] the global modulepath setting
     # @return [Array<Puppet::Environments::Directories>] An array
     #   of configured directory loaders.
     def self.from_path(path, global_module_path)
@@ -148,29 +178,50 @@ module Puppet::Environments
 
     # @!macro loader_list
     def list
-      base = Puppet::FileSystem.path_string(@environment_dir)
+      valid_directories.collect do |envdir|
+        name = Puppet::FileSystem.basename_string(envdir)
+
+        setting_values = Puppet.settings.values(name, Puppet.settings.preferred_run_mode)
+        env = Puppet::Node::Environment.create(
+          name.intern,
+          Puppet::Node::Environment.split_path(setting_values.interpolate(:modulepath)),
+          setting_values.interpolate(:manifest),
+          setting_values.interpolate(:config_version)
+        )
+        env.watching = false
+        env
+      end
+    end
+
+    # @!macro loader_get
+    def get(name)
+      list.find { |env| env.name == name.intern }
+    end
 
+    # @!macro loader_get_conf
+    def get_conf(name)
+      valid_directories.each do |envdir|
+        envname = Puppet::FileSystem.basename_string(envdir)
+        if envname == name.to_s
+          return Puppet::Settings::EnvironmentConf.load_from(envdir, @global_module_path)
+        end
+      end
+      nil
+    end
+
+    private
+
+    def valid_directories
       if Puppet::FileSystem.directory?(@environment_dir)
         Puppet::FileSystem.children(@environment_dir).select do |child|
           name = Puppet::FileSystem.basename_string(child)
           Puppet::FileSystem.directory?(child) &&
              Puppet::Node::Environment.valid_name?(name)
-        end.collect do |child|
-          name = Puppet::FileSystem.basename_string(child)
-          Puppet::Node::Environment.create(
-            name.intern,
-            [File.join(base, name, "modules")] + @global_module_path,
-            File.join(base, name, "manifests"))
         end
       else
         []
       end
     end
-
-    # @!macro loader_get
-    def get(name)
-      list.find { |env| env.name == name.intern }
-    end
   end
 
   # Combine together multiple loaders to act as one.
@@ -199,5 +250,110 @@ module Puppet::Environments
       end
       nil
     end
+
+    # @!macro loader_get_conf
+    def get_conf(name)
+      @loaders.each do |loader|
+        if conf = loader.get_conf(name)
+          return conf
+        end
+      end
+      nil
+    end
+
+  end
+
+  class Cached < Combined
+    INFINITY = 1.0 / 0.0
+
+    def initialize(*loaders)
+      super
+      @cache = {}
+    end
+
+    def get(name)
+      evict_if_expired(name)
+      if result = @cache[name]
+        return result.value
+      elsif (result = super(name))
+        @cache[name] = entry(result)
+        result
+      end
+    end
+
+    # 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)
+      @cache.delete(name)
+    end
+
+    # Clears all cached environments.
+    # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
+    def clear_all()
+      @cache = {}
+    end
+
+    # This implementation evicts the cache, and always gets the current configuration of the environment
+    # TODO: While this is wasteful since it needs to go on a search for the conf, it is too disruptive to optimize
+    # this.
+    #
+    def get_conf(name)
+      evict_if_expired(name)
+      super name
+    end
+
+    # Creates a suitable cache entry given the time to live for one environment
+    #
+    def entry(env)
+      ttl = (conf = get_conf(env.name)) ? conf.environment_timeout : Puppet.settings.value(:environment_timeout)
+      case ttl
+      when 0
+        NotCachedEntry.new(env)     # Entry that is always expired (avoids syscall to get time)
+      when INFINITY
+        Entry.new(env)              # Entry that never expires (avoids syscall to get time)
+      else
+        TTLEntry.new(env, ttl)
+      end
+    end
+
+    # Evicts the entry if it has expired
+    #
+    def evict_if_expired(name)
+      if (result = @cache[name]) && result.expired?
+        @cache.delete(name)
+      end
+    end
+
+    # Never evicting entry
+    class Entry
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def expired?
+        false
+      end
+    end
+
+    # Always evicting entry
+    class NotCachedEntry < Entry
+      def expired?
+        true
+      end
+    end
+
+    # Time to Live eviction policy entry
+    class TTLEntry < Entry
+      def initialize(value, ttl_seconds)
+        super value
+        @ttl = Time.now + ttl_seconds
+      end
+
+      def expired?
+        Time.now > @ttl
+      end
+    end
   end
 end