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

data/lib/puppet/provider/service/redhat.rb

@@ -21,15 +21,18 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   end
 
   def enabled?
-    # Checkconfig always returns 0 on SuSE unless the --check flag is used.
-    args = (Facter.value(:osfamily) == 'Suse' ? ['--check'] : [])
+    name = @resource[:name]
 
     begin
-      chkconfig(@resource[:name], *args)
+      output = chkconfig name
     rescue Puppet::ExecutionFailure
       return :false
     end
 
+    # For Suse OS family, chkconfig returns 0 even if the service is disabled or non-existent
+    # Therefore, check the output for '<name>  on' to see if it is enabled
+    return :false unless Facter.value(:osfamily) != 'Suse' || output =~ /^#{name}\s+on$/
+
     :true
   end
 

data/lib/puppet/provider/service/systemd.rb

@@ -10,8 +10,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def self.instances
     i = []
-    output = systemctl('list-units', '--type', 'service', '--full', '--all',  '--no-pager')
-    output.scan(/^(\S+)\s+(loaded|error)\s+(active|inactive)\s+(active|waiting|running|plugged|mounted|dead|exited|listening|elapsed)\s*?(\S.*?)?$/i).each do |m|
+    output = systemctl('list-unit-files', '--type', 'service', '--full', '--all',  '--no-pager')
+    output.scan(/^(\S+)\s+(disabled|enabled)\s*$/i).each do |m|
       i << new(:name => m[0])
     end
     return i

data/lib/puppet/provider/yumrepo/inifile.rb

@@ -1,23 +1,45 @@
 require 'puppet/util/inifile'
 
 Puppet::Type.type(:yumrepo).provide(:inifile) do
-  desc 'Manage yum repos'
+  desc <<-EOD
+    Manage yum repo configurations by parsing yum INI configuration files.
+
+    ## Fetching instances
+
+    When fetching repo instances, directory entries in '/etc/yum/repos.d',
+    '/etc/yum.repos.d', and the directory optionally specified by the reposdir
+    key in '/etc/yum.conf' will be checked. If a given directory does not exist it
+    will be ignored. In addition, all sections in '/etc/yum.conf' aside from
+    'main' will be created as sections.
+
+    ## Storing instances
+
+    When creating a new repository, a new section will be added in the first
+    yum repo directory that exists. The custom directory specified by the
+    '/etc/yum.conf' reposdir property is checked first, followed by
+    '/etc/yum/repos.d', and then '/etc/yum.repos.d'. If none of these exist, the
+    section will be created in '/etc/yum.conf'.
+  EOD
 
   PROPERTIES = Puppet::Type.type(:yumrepo).validproperties
 
-  # @return [Array<Puppet::Providers>] Return all the providers built up from
-  #   discovered content on the local node.
+  # Retrieve all providers based on existing yum repositories
+  #
+  # @api public
+  # @return [Array<Puppet::Provider>] providers generated from existing yum
+  #   repository definitions.
   def self.instances
     instances = []
-    # Iterate over each section of our virtual file.
+
     virtual_inifile.each_section do |section|
+      # Ignore the 'main' section in yum.conf since it's not a repository.
+      next if section.name == "main"
+
       attributes_hash = {:name => section.name, :ensure => :present, :provider => :yumrepo}
-      # We need to build up a attributes hash
+
       section.entries.each do |key, value|
         key = key.to_sym
         if valid_property?(key)
-          # We strip the values here to handle cases where distros set values
-          # like enabled = 1 with spaces.
           attributes_hash[key] = value
         elsif key == :name
           attributes_hash[:descr] = value
@@ -25,11 +47,15 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
       end
       instances << new(attributes_hash)
     end
-  return instances
+
+    instances
   end
 
-  # @param resources [Array<Puppet::Resource>] Resources to prefetch.
-  # @return [Array<Puppet::Resource>] Resources with providers set.
+  # Match catalog type instances to provider instances.
+  #
+  # @api public
+  # @param resources [Array<Puppet::Type::Yumrepo>] Resources to prefetch.
+  # @return [void]
   def self.prefetch(resources)
     repos = instances
     resources.keys.each do |name|
@@ -39,10 +65,12 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     end
   end
 
-  # Return a list of existing directories that could contain repo files.  Fail if none found.
+  # Return a list of existing directories that could contain repo files.
+  #
+  # @api private
   # @param conf [String] Configuration file to look for directories in.
-  # @param dirs [Array] Default locations for yum repos.
-  # @return [Array] Directories that were found to exist on the node.
+  # @param dirs [Array<String>] Default locations for yum repos.
+  # @return [Array<String>] All present directories that may contain yum repo configs.
   def self.reposdir(conf='/etc/yum.conf', dirs=['/etc/yum.repos.d', '/etc/yum/repos.d'])
     reposdir = find_conf_value('reposdir', conf)
     dirs << reposdir if reposdir
@@ -51,70 +79,103 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     # dirs.select! { |dir| Puppet::FileSystem.exist?(dir) }
     dirs.delete_if { |dir| ! Puppet::FileSystem.exist?(dir)  }
     if dirs.empty?
-      fail('No yum directories were found on the local filesystem')
-    else
-      return dirs
+      Puppet.debug('No yum directories were found on the local filesystem')
     end
+
+    dirs
+  end
+
+  # Used for testing only
+  # @api private
+  def self.clear
+    @virtual = nil
   end
 
   # Helper method to look up specific values in ini style files.
-  # @todo Migrate this into Puppet::Util::IniConfig.
+  #
+  # @api private
   # @param value [String] Value to look for in the configuration file.
   # @param conf [String] Configuration file to check for value.
   # @return [String] The value of a looked up key from the configuration file.
   def self.find_conf_value(value, conf='/etc/yum.conf')
     if Puppet::FileSystem.exist?(conf)
-      contents = Puppet::FileSystem.read(conf)
-      match = /^#{value}\s*=\s*(.*)/.match(contents)
+      file = Puppet::Util::IniConfig::PhysicalFile.new(conf)
+      if (main = file.get_section('main'))
+        main[value]
+      end
+    end
+  end
+
+  # Enumerate all files that may contain yum repository configs.
+  # '/etc/yum.conf' is always included.
+  #
+  # @api private
+  # @return [Array<String>
+  def self.repofiles
+    files = ["/etc/yum.conf"]
+    reposdir.each do |dir|
+      Dir.glob("#{dir}/*.repo").each do |file|
+        files << file
+      end
     end
 
-    return match.captures[0] if match
+    files
   end
 
-  # Build a virtual inifile by reading in numerous .repo
-  # files into a single virtual file to ease manipulation.
+  # Build a virtual inifile by reading in numerous .repo files into a single
+  # virtual file to ease manipulation.
+  # @api private
   # @return [Puppet::Util::IniConfig::File] The virtual inifile representing
   #   multiple real files.
   def self.virtual_inifile
     unless @virtual
       @virtual = Puppet::Util::IniConfig::File.new
-      reposdir.each do |dir|
-        Dir.glob("#{dir}/*.repo").each do |file|
-          @virtual.read(file) if Puppet::FileSystem.file?(file)
-        end
+      self.repofiles.each do |file|
+        @virtual.read(file) if Puppet::FileSystem.file?(file)
       end
     end
     return @virtual
   end
 
+  # Is the given key a valid type property?
+  #
+  # @api private
   # @param key [String] The property to look up.
   # @return [Boolean] Returns true if the property is defined in the type.
   def self.valid_property?(key)
     PROPERTIES.include?(key)
   end
 
-  # We need to return a valid section from the larger virtual inifile here,
-  # which we do by first looking it up and then creating a new section for
-  # the appropriate name if none was found.
+  # Return an existing INI section or create a new section in the default location
+  #
+  # The default location is determined based on what yum repo directories
+  # and files are present. If /etc/yum.conf has a value for 'reposdir' then that
+  # is preferred. If no such INI property is found then the first default yum
+  # repo directory that is present is used. If no default directories exist then
+  # /etc/yum.conf is used.
+  #
   # @param name [String] Section name to lookup in the virtual inifile.
   # @return [Puppet::Util::IniConfig] The IniConfig section
   def self.section(name)
     result = self.virtual_inifile[name]
     # Create a new section if not found.
     unless result
-      # Previously we did an .each on reposdir with the effect that we
-      # constantly created and overwrote result until the last entry of
-      # the array.  This was done because the ordering is
-      # [defaults, custom] for reposdir and we want to use the custom if
-      # we have it and the defaults if not.
-      path = ::File.join(reposdir.last, "#{name}.repo")
-      Puppet.info("create new repo #{name} in file #{path}")
+      dirs = reposdir()
+      if dirs.empty?
+        # If no repo directories are present, default to using yum.conf.
+        path = '/etc/yum.conf'
+      else
+        # The ordering of reposdir is [defaults, custom], and we want to use
+        # the custom directory if present.
+        path = File.join(dirs.last, "#{name}.repo")
+      end
       result = self.virtual_inifile.add_section(name, path)
     end
     result
   end
 
-  # Here we store all modifications to disk, forcing the output file to 0644 if it differs.
+  # Save all yum repository files and force the mode to 0644
+  # @api private
   # @return [void]
   def self.store
     inifile = self.virtual_inifile
@@ -130,6 +191,10 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     end
   end
 
+  # Create a new section for the given repository and set all the specified
+  # properties in the section.
+  #
+  # @api public
   # @return [void]
   def create
     @property_hash[:ensure] = :present
@@ -143,20 +208,26 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     PROPERTIES.each do |property|
       next if property == :ensure
 
-
       if value = @resource.should(property)
         self.send("#{property}=", value)
       end
     end
   end
 
-  # @return [Boolean] Returns true if ensure => present.
+  # Does the given repository already exist?
+  #
+  # @api public
+  # @return [Boolean]
   def exists?
     @property_hash[:ensure] == :present
   end
 
-  # We don't actually destroy the file here, merely mark it for
-  # destruction in the section.
+  # Mark the given repository section for destruction.
+  #
+  # The actual removal of the section will be handled by {#flush} after the
+  # resource has been fully evaluated.
+  #
+  # @api public
   # @return [void]
   def destroy
     # Flag file for deletion on flush.
@@ -165,6 +236,9 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     @property_hash.clear
   end
 
+  # Finalize the application of the given resource.
+  #
+  # @api public
   # @return [void]
   def flush
     self.class.store
@@ -216,7 +290,6 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     @property_hash[property] = value
   end
 
-  # @return [void]
   def section(name)
     self.class.section(name)
   end

data/lib/puppet/resource.rb

@@ -251,7 +251,11 @@ class Puppet::Resource
   end
 
   def environment
-    @environment ||= Puppet.lookup(:environments).get(Puppet[:environment])
+    @environment ||= if catalog
+                       catalog.environment_instance
+                     else
+                       Puppet::Node::Environment::NONE
+                     end
   end
 
   def environment=(environment)
@@ -383,6 +387,14 @@ class Puppet::Resource
   def copy_as_resource
     result = Puppet::Resource.new(type, title)
 
+    result.file = self.file
+    result.line = self.line
+    result.exported = self.exported
+    result.virtual = self.virtual
+    result.tag(*self.tags)
+    result.environment = environment
+    result.instance_variable_set(:@rstype, resource_type)
+
     to_hash.each do |p, v|
       if v.is_a?(Puppet::Resource)
         v = Puppet::Resource.new(v.type, v.title)
@@ -406,14 +418,6 @@ class Puppet::Resource
                   end
     end
 
-    result.file = self.file
-    result.line = self.line
-    result.exported = self.exported
-    result.virtual = self.virtual
-    result.tag(*self.tags)
-    result.environment = environment
-    result.instance_variable_set(:@rstype, resource_type)
-
     result
   end
 

data/lib/puppet/resource/catalog.rb

@@ -46,9 +46,12 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # Some metadata to help us compile and generally respond to the current state.
   attr_accessor :client_version, :server_version
 
-  # The environment for this catalog
+  # A String representing the environment for this catalog
   attr_accessor :environment
 
+  # The actual environment instance that was used during compilation
+  attr_accessor :environment_instance
+
   # Add classes to our class list.
   def add_class(*classes)
     classes.each do |klass|
@@ -232,15 +235,17 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     host_config
   end
 
-  def initialize(name = nil)
+  def initialize(name = nil, environment = Puppet::Node::Environment::NONE)
     super()
-    @name = name if name
+    @name = name
     @classes = []
     @resource_table = {}
     @resources = []
     @relationship_graph = nil
 
     @host_config = true
+    @environment_instance = environment
+    @environment = environment.to_s
 
     @aliases = {}
 
@@ -294,6 +299,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       # Reference class canonicalizes for us.
       res = Puppet::Resource.new(nil, type)
     end
+    res.catalog = self
     title_key      = [res.type, res.title.to_s]
     uniqueness_key = [res.type, res.uniqueness_key].flatten
     @resource_table[title_key] || @resource_table[uniqueness_key]
@@ -314,7 +320,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   end
 
   def self.from_data_hash(data)
-    result = new(data['name'])
+    result = new(data['name'], Puppet::Node::Environment::NONE)
 
     if tags = data['tags']
       result.tag(*tags)
@@ -326,6 +332,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
     if environment = data['environment']
       result.environment = environment
+      result.environment_instance = Puppet::Node::Environment.remote(environment.to_sym)
     end
 
     if resources = data['resources']
@@ -484,10 +491,9 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # This pretty much just converts all of the resources from one class to another, using
   # a conversion method.
   def to_catalog(convert)
-    result = self.class.new(self.name)
+    result = self.class.new(self.name, self.environment_instance)
 
     result.version = self.version
-    result.environment = self.environment
 
     map = {}
     resources.each do |resource|

data/lib/puppet/resource/type_collection.rb

@@ -139,16 +139,16 @@ class Puppet::Resource::TypeCollection
 
   def version
     if !defined?(@version)
-      if environment[:config_version] == ""
+      if environment.config_version.nil? || environment.config_version == ""
         @version = Time.now.to_i
       else
-        @version = Puppet::Util::Execution.execute([environment[:config_version]]).strip
+        @version = Puppet::Util::Execution.execute([environment.config_version]).strip
       end
     end
 
     @version
   rescue Puppet::ExecutionFailure => e
-    raise Puppet::ParseError, "Execution of config_version command `#{environment[:config_version]}` failed: #{e.message}", e.backtrace
+    raise Puppet::ParseError, "Execution of config_version command `#{environment.config_version}` failed: #{e.message}", e.backtrace
   end
 
   def watch_file(filename)

data/lib/puppet/settings.rb

@@ -18,10 +18,12 @@ class Puppet::Settings
   require 'puppet/settings/boolean_setting'
   require 'puppet/settings/terminus_setting'
   require 'puppet/settings/duration_setting'
+  require 'puppet/settings/ttl_setting'
   require 'puppet/settings/priority_setting'
   require 'puppet/settings/autosign_setting'
   require 'puppet/settings/config_file'
   require 'puppet/settings/value_translator'
+  require 'puppet/settings/environment_conf'
 
   # local reference for convenience
   PuppetOptionParser = Puppet::Util::CommandLine::PuppetOptionParser
@@ -107,6 +109,7 @@ class Puppet::Settings
   # @return [Object] the value of the setting
   # @api private
   def [](param)
+    Puppet.deprecation_warning("Accessing '#{param}' as a setting is deprecated. See http://links.puppetlabs.com/env-settings-deprecations") if DEPRECATED_SETTINGS.include?(param)
     value(param)
   end
 
@@ -115,6 +118,7 @@ class Puppet::Settings
   # @param value [Object] the new value of the setting
   # @api private
   def []=(param, value)
+    Puppet.deprecation_warning("Modifying '#{param}' as a setting is deprecated. See http://links.puppetlabs.com/env-settings-deprecations") if DEPRECATED_SETTINGS.include?(param)
     @value_sets[:memory].set(param, value)
     unsafe_flush_cache
   end
@@ -388,6 +392,10 @@ class Puppet::Settings
       end
     end
 
+    if FULLY_DEPRECATED_SETTINGS.include?(str)
+      Puppet.deprecation_warning("Setting #{str} is deprecated. See http://links.puppetlabs.com/env-settings-deprecations", "setting-#{str}")
+    end
+
     @value_sets[:cli].set(str, value)
     unsafe_flush_cache
   end
@@ -525,6 +533,8 @@ class Puppet::Settings
     # If we get here and don't have any data, we just return and don't muck with the current state of the world.
     return if data.nil?
 
+    issue_deprecations(data)
+
     # If we get here then we have some data, so we need to clear out any previous settings that may have come from
     #  config files.
     unsafe_clear(false, false)
@@ -645,6 +655,7 @@ class Puppet::Settings
       :boolean    => BooleanSetting,
       :terminus   => TerminusSetting,
       :duration   => DurationSetting,
+      :ttl        => TTLSetting,
       :enum       => EnumSetting,
       :priority   => PrioritySetting,
       :autosign   => AutosignSetting,
@@ -863,7 +874,7 @@ class Puppet::Settings
   def to_catalog(*sections)
     sections = nil if sections.empty?
 
-    catalog = Puppet::Resource::Catalog.new("Settings")
+    catalog = Puppet::Resource::Catalog.new("Settings", Puppet::Node::Environment::NONE)
 
     @config.keys.find_all { |key| @config[key].is_a?(FileSetting) }.each do |key|
       file = @config[key]
@@ -1032,9 +1043,37 @@ Generated on #{Time.now}.
     end
   end
 
+  # This method just turns a file into a new ConfigFile::Conf instance
+  # @param file [String] absolute path to the configuration file
+  # @return [Puppet::Settings::ConfigFile::Conf]
+  # @api private
+  def parse_file(file)
+    @config_file_parser.parse_file(file, read_file(file))
+  end
 
   private
 
+  DEPRECATED_ENVIRONMENT_SETTINGS = [:manifest, :modulepath, :config_version].freeze
+  FULLY_DEPRECATED_SETTINGS = [:templatedir, :manifestdir].freeze
+  DEPRECATED_SETTINGS = (DEPRECATED_ENVIRONMENT_SETTINGS + FULLY_DEPRECATED_SETTINGS).freeze
+
+  def issue_deprecations(data)
+    sections = data.sections.inject([]) do |accum,entry|
+      accum << entry[1] if [:main, :master, :agent, :user].include?(entry[0])
+      accum
+    end
+
+    sections.each do |section|
+      DEPRECATED_ENVIRONMENT_SETTINGS.each do |s|
+        Puppet.deprecation_warning("Setting #{s} is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations", "puppet-conf-setting-#{s}") if !section.setting(s).nil?
+      end
+
+      FULLY_DEPRECATED_SETTINGS.each do |s|
+        Puppet.deprecation_warning("Setting #{s} is deprecated. See http://links.puppetlabs.com/env-settings-deprecations", "setting-#{s}") if !section.setting(s).nil?
+      end
+    end
+  end
+
   def get_config_file_default(default)
     obj = nil
     unless obj = @config[default]
@@ -1086,28 +1125,18 @@ Generated on #{Time.now}.
             values_from_section = ValuesFromSection.new(name, section)
           end
         end
-        if values_from_section.nil? && @global_defaults_initialized
-          values_from_section = ValuesFromCurrentEnvironment.new(name)
+        if values_from_section.nil? && global_defaults_initialized?
+          values_from_section = ValuesFromEnvironmentConf.new(name)
         end
         values_from_section
       end
     end.compact
   end
 
-  # This method just turns a file in to a hash of hashes.
-  def parse_file(file)
-    @config_file_parser.parse_file(file, read_file(file))
-  end
-
   # Read the file in.
+  # @api private
   def read_file(file)
-    begin
-      return File.read(file)
-    rescue Errno::ENOENT
-      raise ArgumentError, "No such file #{file}", $!.backtrace
-    rescue Errno::EACCES
-      raise ArgumentError, "Permission denied to file #{file}", $!.backtrace
-    end
+    return Puppet::FileSystem.read(file)
   end
 
   # Private method for internal test use only; allows to do a comprehensive clear of all settings between tests.
@@ -1277,38 +1306,30 @@ Generated on #{Time.now}.
   end
 
   # @api private
-  class ValuesFromCurrentEnvironment
-    def initialize(desired_environment)
-      @desired_environment = desired_environment
+  class ValuesFromEnvironmentConf
+    def initialize(environment_name)
+      @environment_name = environment_name
     end
 
     def include?(name)
-      return false unless name == :modulepath || name == :manifest
-      if i = instance
-        i.include?(name)
+      if Puppet::Settings::EnvironmentConf::VALID_SETTINGS.include?(name) && conf
+        return true
       end
+      false
     end
 
     def lookup(name)
-      return nil unless name == :modulepath || name == :manifest
-      if i = instance
-        i[name]
-      end
+      return nil unless Puppet::Settings::EnvironmentConf::VALID_SETTINGS.include?(name)
+      conf.send(name) if conf
     end
 
-    private
-
-    def instance
-      unless @instance
-        env = Puppet.lookup(:current_environment)
-        if env.name == @desired_environment
-          @instance = {
-            :modulepath => env.full_modulepath.join(File::PATH_SEPARATOR),
-            :manifest => env.manifest,
-          }
+    def conf
+      unless @conf
+        if environments = Puppet.lookup(:environments)
+          @conf = environments.get_conf(@environment_name)
         end
       end
-      return @instance
+      return @conf
     end
   end
 end