puppet 3.8.7 → 4.0.0

data/lib/puppet/ssl/host.rb

@@ -126,11 +126,6 @@ DOC
     instance
   end
 
-  def self.from_pson(pson)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(pson)
-  end
-
   # Puppet::SSL::Host is actually indirected now so the original implementation
   # has been moved into the certificate_status indirector.  This method does not
   # appear to be in use in `puppet cert -l`.
@@ -326,9 +321,7 @@ ERROR_STRING
       return if certificate
       generate
       return if certificate
-    rescue SystemExit,NoMemoryError
-      raise
-    rescue Exception => detail
+    rescue StandardError => detail
       Puppet.log_exception(detail, "Could not request certificate: #{detail.message}")
       if time < 1
         puts "Exiting; failed to retrieve certificate and waitforcert is disabled"

data/lib/puppet/ssl/inventory.rb

@@ -35,13 +35,6 @@ class Puppet::SSL::Inventory
     end
   end
 
-  # Find the serial number for a given certificate.
-  def serial(name)
-    Puppet.deprecation_warning 'Inventory#serial is deprecated, use Inventory#serials instead.'
-    return nil unless Puppet::FileSystem.exist?(@path)
-    serials(name).first
-  end
-
   # Find all serial numbers for a given certificate. If none can be found, returns
   # an empty array.
   def serials(name)

data/lib/puppet/ssl/oids.rb

@@ -35,12 +35,81 @@ module Puppet::SSL::Oids
     ["1.3.6.1.4.1.34380.1.1.2", 'pp_instance_id', 'Puppet Node Instance ID'],
     ["1.3.6.1.4.1.34380.1.1.3", 'pp_image_name', 'Puppet Node Image Name'],
     ["1.3.6.1.4.1.34380.1.1.4", 'pp_preshared_key', 'Puppet Node Preshared Key'],
-
+    ["1.3.6.1.4.1.34380.1.1.5", 'pp_cost_center', 'Puppet Node Cost Center Name'],
+    ["1.3.6.1.4.1.34380.1.1.6", 'pp_product', 'Puppet Node Product Name'],
+    ["1.3.6.1.4.1.34380.1.1.7", 'pp_project', 'Puppet Node Project Name'],
+    ["1.3.6.1.4.1.34380.1.1.8", 'pp_application', 'Puppet Node Application Name'],
+    ["1.3.6.1.4.1.34380.1.1.9", 'pp_service', 'Puppet Node Service Name'],
+    ["1.3.6.1.4.1.34380.1.1.10", 'pp_employee', 'Puppet Node Employee Name'],
+    ["1.3.6.1.4.1.34380.1.1.11", 'pp_created_by', 'Puppet Node created_by Tag'],
+    ["1.3.6.1.4.1.34380.1.1.12", 'pp_environment', 'Puppet Node Environment Name'],
+    ["1.3.6.1.4.1.34380.1.1.13", 'pp_role', 'Puppet Node Role Name'],
+    ["1.3.6.1.4.1.34380.1.1.14", 'pp_software_version', 'Puppet Node Software Version'],
+    ["1.3.6.1.4.1.34380.1.1.15", 'pp_department', 'Puppet Node Department Name'],
+    ["1.3.6.1.4.1.34380.1.1.16", 'pp_cluster', 'Puppet Node Cluster Name'],
+    ["1.3.6.1.4.1.34380.1.1.17", 'pp_provisioner', 'Puppet Node Provisioner Name'],
+    
     ["1.3.6.1.4.1.34380.1.2", 'ppPrivCertExt', 'Puppet Private Certificate Extension'],
   ]
 
-  PUPPET_OIDS.each do |oid_defn|
-    OpenSSL::ASN1::ObjectId.register(*oid_defn)
+  # Register our custom Puppet OIDs with OpenSSL so they can be used as CSR
+  # extensions. Without registering these OIDs, OpenSSL will fail when it
+  # encounters such an extension in a CSR.
+  def self.register_puppet_oids()
+    PUPPET_OIDS.each do |oid_defn|
+      OpenSSL::ASN1::ObjectId.register(*oid_defn)
+    end
+  end
+
+  # Parse and load custom OID mapping file that enables custom OIDs to be resolved
+  # into user-friendly names.
+  #
+  # @param custom_oid_file [String] File to obtain custom OIDs mapping from
+  # @param map_key [String] Hash key in which custom OIDs mapping is stored
+  #
+  # @example Custom OID mapping file
+  # ---
+  # oid_mapping:
+  #  '1.3.6.1.4.1.34380.1.2.1.1':
+  #    shortname : 'myshortname'
+  #    longname  : 'Long name'
+  #  '1.3.6.1.4.1.34380.1.2.1.2':
+  #    shortname: 'myothershortname'
+  #    longname: 'Other Long name'
+  def self.load_custom_oid_file(custom_oid_file, map_key='oid_mapping')
+    if File.exists?(custom_oid_file) && File.readable?(custom_oid_file)
+      mapping = nil
+      begin
+        mapping = YAML.load_file(custom_oid_file)
+      rescue => err
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': #{err}", err.backtrace
+      end
+
+      unless mapping.has_key?(map_key)
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': no such index '#{map_key}'"
+      end
+
+      unless mapping[map_key].is_a?(Hash)
+        raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': data under index '#{map_key}' must be a Hash"
+      end
+
+      oid_defns = []
+      mapping[map_key].keys.each do |oid|
+        shortname, longname = mapping[map_key][oid].values_at("shortname","longname")
+        if shortname.nil? || longname.nil?
+          raise Puppet::Error, "Error loading ssl custom OIDs mapping file from '#{custom_oid_file}': incomplete definition of oid '#{oid}'"
+        end
+        oid_defns << [oid, shortname, longname]
+      end
+
+      begin
+        oid_defns.each do |oid_defn|
+          OpenSSL::ASN1::ObjectId.register(*oid_defn)
+        end
+      rescue => err
+        raise ArgumentError, "Error registering ssl custom OIDs mapping from file '#{custom_oid_file}': #{err}", err.backtrace
+      end
+    end
   end
 
   # Determine if the first OID contains the second OID

data/lib/puppet/ssl/validator/default_validator.rb

@@ -23,7 +23,6 @@ class Puppet::SSL::Validator::DefaultValidator #< class Puppet::SSL::Validator
   def initialize(
       ssl_configuration = Puppet::SSL::Configuration.new(
                                         Puppet[:localcacert], {
-                                          :ca_chain_file => Puppet[:ssl_client_ca_chain],
                                           :ca_auth_file  => Puppet[:ssl_client_ca_auth]
                                         }),
       ssl_host = Puppet::SSL::Host.localhost)

data/lib/puppet/status.rb

@@ -22,11 +22,6 @@ class Puppet::Status
     end
   end
 
-  def self.from_pson(pson)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(pson)
-  end
-
   def name
     "status"
   end

data/lib/{puppetx/puppetlabs → puppet}/syntax_checkers/json.rb

@@ -1,7 +1,7 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppetx/puppet/syntax_checker'
-class Puppetx::Puppetlabs::SyntaxCheckers::Json < Puppetx::Puppet::SyntaxChecker
+require 'puppet/syntax_checkers'
+class Puppet::SyntaxCheckers::Json < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for JSON syntax issues and reports them to the given acceptor.
   # This implementation is abstract, it raises {NotImplementedError} since a subclass should have implemented the

data/lib/puppet/syntax_checkers.rb

@@ -0,0 +1,3 @@
+# A name space for syntax checkers provided by Puppet.
+module Puppet::SyntaxCheckers
+end

data/lib/puppet/test/test_helper.rb

@@ -49,13 +49,21 @@ module Puppet::Test
       #
       @@reentry_count ||= 0
 
+      @environmentpath = Dir.mktmpdir('environments')
+      Dir.mkdir("#{@environmentpath}/production")
       owner = Process.pid
       Puppet.push_context(Puppet.base_context({
-        :environmentpath => "",
+        :environmentpath => @environmentpath,
         :basemodulepath => "",
-        :manifest => "/dev/null"
       }), "Initial for specs")
       Puppet::Parser::Functions.reset
+
+      ObjectSpace.define_finalizer(Puppet.lookup(:environments), proc {
+        if Process.pid == owner
+          FileUtils.rm_rf(@environmentpath)
+        end
+      })
+      Puppet::SSL::Oids.register_puppet_oids
     end
 
     # Call this method once, when beginning a test run--prior to running
@@ -128,7 +136,6 @@ module Puppet::Test
         "Context for specs")
 
       Puppet::Parser::Functions.reset
-      Puppet::Node::Environment.clear
       Puppet::Application.clear!
       Puppet::Util::Profiler.clear
 
@@ -173,15 +180,6 @@ module Puppet::Test
         $old_env.each {|k, v| ENV[k] = v }
       end
 
-
-      # Some tests can cause us to connect, in which case the lingering
-      # connection is a resource that can cause unexpected failure in later
-      # tests, as well as sharing state accidentally.
-      # We're testing if ActiveRecord::Base is defined because some test cases
-      # may stub Puppet.features.rails? which is how we should normally
-      # introspect for this functionality.
-      ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
-
       # Restore the load_path late, to avoid messing with stubs from the test.
       $LOAD_PATH.clear
       $old_load_path.each {|x| $LOAD_PATH << x }
@@ -199,6 +197,7 @@ module Puppet::Test
       {
           :logdir     => "/dev/null",
           :confdir    => "/dev/null",
+          :codedir    => "/dev/null",
           :vardir     => "/dev/null",
           :rundir     => "/dev/null",
           :hiera_config => "/dev/null",

data/lib/puppet/transaction/event.rb

@@ -25,11 +25,6 @@ class Puppet::Transaction::Event
     obj
   end
 
-  def self.from_pson(data)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(data)
-  end
-
   def initialize(options = {})
     @audited = false
 
@@ -88,6 +83,10 @@ class Puppet::Transaction::Event
     message
   end
 
+  def inspect
+    %Q(#<#{self.class.name} @name="#{@name.inspect}" @message="#{@message.inspect}">)
+  end
+
   def to_yaml_properties
     YAML_ATTRIBUTES & super
   end

data/lib/puppet/transaction/event_manager.rb

@@ -1,7 +1,21 @@
 require 'puppet/transaction'
 
+# This class stores, routes, and responds to events generated while evaluating
+# a transaction.
+#
+# @api private
 class Puppet::Transaction::EventManager
-  attr_reader :transaction, :events
+
+  # @!attribute [r] transaction
+  #   @return [Puppet::Transaction] The transaction associated with this event manager.
+  attr_reader :transaction
+
+  # @!attribute [r] events
+  #   @todo Determine if this instance variable is used for anything aside from testing.
+  #   @return [Array<Puppet::Transaction::Events>] A list of events that can be
+  #     handled by the target resouce. Events that cannot be handled by the
+  #     target resource will be discarded.
+  attr_reader :events
 
   def initialize(transaction)
     @transaction = transaction
@@ -28,8 +42,12 @@ class Puppet::Transaction::EventManager
     end
   end
 
-  # Queue events for other resources to respond to.  All of these events have
+  # Queues events for other resources to respond to.  All of these events have
   # to be from the same resource.
+  #
+  # @param resource [Puppet::Type] The resource generating the given events
+  # @param events [Array<Puppet::Transaction::Event>] All events generated by this resource
+  # @return [void]
   def queue_events(resource, events)
     #@events += events
 
@@ -63,9 +81,17 @@ class Puppet::Transaction::EventManager
     dequeue_events_for_resource(resource, :refresh) if events.detect { |e| e.invalidate_refreshes }
   end
 
+  def dequeue_all_events_for_resource(target)
+    callbacks = @event_queues[target]
+    if callbacks && !callbacks.empty?
+      target.info "Unscheduling all events on #{target}"
+      @event_queues[target] = {}
+    end
+  end
+
   def dequeue_events_for_resource(target, callback)
     target.info "Unscheduling #{callback} on #{target}"
-    @event_queues[target][callback] = {} if @event_queues[target]
+    @event_queues[target][callback] = [] if @event_queues[target]
   end
 
   def queue_events_for_resource(source, target, callback, events)
@@ -96,8 +122,28 @@ class Puppet::Transaction::EventManager
 
   private
 
+  # Should the callback for this resource be invoked?
+  # @param resource [Puppet::Type] The resource to be refreshed
+  # @param events [Array<Puppet::Transaction::Event>] A list of events
+  #   associated with this callback and resource.
+  # @return [true, false] Whether the callback should be run.
+  def process_callback?(resource, events)
+    !(events.all? { |e| e.status == "noop" } || resource.noop?)
+  end
+
+  # Processes callbacks for a given resource.
+  #
+  # @param resource [Puppet::Type] The resource receiving the callback.
+  # @param callback [Symbol] The name of the callback method that will be invoked.
+  # @param events [Array<Puppet::Transaction::Event>] A list of events
+  #   associated with this callback and resource.
+  # @return [true, false] Whether the callback was successfully run.
   def process_callback(resource, callback, events)
-    process_noop_events(resource, callback, events) and return false unless events.detect { |e| e.status != "noop" }
+    if !process_callback?(resource, events)
+      process_noop_events(resource, callback, events)
+      return false
+    end
+
     resource.send(callback)
 
     if not resource.is_a?(Puppet::Type.type(:whit))
@@ -117,6 +163,5 @@ class Puppet::Transaction::EventManager
 
     # And then add an event for it.
     queue_events(resource, [resource.event(:status => "noop", :name => :noop_restart)])
-    true # so the 'and if' works
   end
 end

data/lib/puppet/transaction/report.rb

@@ -103,11 +103,6 @@ class Puppet::Transaction::Report
     obj
   end
 
-  def self.from_pson(data)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(data)
-  end
-
   def as_logging_destination(&block)
     Puppet::Util::Log.with_destination(self, &block)
   end
@@ -127,8 +122,8 @@ class Puppet::Transaction::Report
   def add_metric(name, hash)
     metric = Puppet::Util::Metric.new(name)
 
-    hash.each do |name, value|
-      metric.newvalue(name, value)
+    hash.each do |metric_name, value|
+      metric.newvalue(metric_name, value)
     end
 
     @metrics[metric.name] = metric
@@ -286,8 +281,8 @@ class Puppet::Transaction::Report
     @metrics.each do |name, metric|
       key = metric.name.to_s
       report[key] = {}
-      metric.values.each do |name, label, value|
-        report[key][name.to_s] = value
+      metric.values.each do |metric_name, label, value|
+        report[key][metric_name.to_s] = value
       end
       report[key]["total"] = 0 unless key == "time" or report[key].include?("total")
     end
@@ -324,7 +319,7 @@ class Puppet::Transaction::Report
   end
 
   def self.default_format
-    Puppet[:report_serialization_format].intern
+    :pson
   end
 
   private

data/lib/puppet/transaction/resource_harness.rb

@@ -108,6 +108,12 @@ class Puppet::Transaction::ResourceHarness
     end
   end
 
+  # allow_changes? is only made public to enable the existing spec tests to run
+  # under rspec 3 (apparently rspec 2 didn't enforce access controls?). Please do not
+  # treat this as part of a public API.
+  # Possible future improvement: rewrite to not require access to private methods.
+  public :allow_changes?
+
   def sync_if_needed(param, context)
     historical_value = context.historical_values[param.name]
     current_value = context.current_values[param.name]
@@ -170,8 +176,7 @@ class Puppet::Transaction::ResourceHarness
   # For audit purposes, this code special cases this comparison, and compares
   # the two objects by their second and microsecond components. tv_sec is the
   # number of seconds since the epoch, and tv_usec is only the microsecond
-  # portion of time.  This compare satisfies compatibility requirements for
-  # Ruby 1.8.7, where to_r does not exist on the Time class.
+  # portion of time.
   def are_audited_values_equal(a, b)
     a == b || (a.is_a?(Time) && b.is_a?(Time) && a.tv_sec == b.tv_sec && a.tv_usec == b.tv_usec)
   end

data/lib/puppet/transaction.rb

@@ -212,13 +212,13 @@ class Puppet::Transaction
   def eval_resource(resource, ancestor = nil)
     if skip?(resource)
       resource_status(resource).skipped = true
+      resource.debug("Resource is being skipped, unscheduling all events")
+      event_manager.dequeue_all_events_for_resource(resource)
     else
       resource_status(resource).scheduled = true
       apply(resource, ancestor)
+      event_manager.process_events(resource)
     end
-
-    # Check to see if there are any events queued for this resource
-    event_manager.process_events(resource)
   end
 
   def failed?(resource)
@@ -284,7 +284,7 @@ class Puppet::Transaction
 
   def resources_by_provider(type_name, provider_name)
     unless @resources_by_provider
-      @resources_by_provider = Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = {} } }
+      @resources_by_provider = Hash.new { |h, k| h[k] = Hash.new { |h1, k1| h1[k1] = {} } }
 
       @catalog.vertices.each do |resource|
         if resource.class.attrclass(:provider)
@@ -305,7 +305,7 @@ class Puppet::Transaction
     Puppet.debug "Prefetching #{provider_class.name} resources for #{type_name}"
     begin
       provider_class.prefetch(resources)
-    rescue => detail
+    rescue LoadError, Puppet::MissingCommand => detail
       Puppet.log_exception(detail, "Could not prefetch #{type_name} provider '#{provider_class.name}': #{detail}")
     end
     @prefetched_providers[type_name][provider_class.name] = true
@@ -350,10 +350,6 @@ class Puppet::Transaction
     resource.appliable_to_host? && resource.appliable_to_device?
   end
 
-  def split_qualified_tags?
-    false
-  end
-
   # Is this resource tagged appropriately?
   def missing_tags?(resource)
     return false if ignore_tags?
@@ -362,6 +358,13 @@ class Puppet::Transaction
     not resource.tagged?(*tags)
   end
 
+  # These two methods are only made public to enable the existing spec tests to run
+  # under rspec 3 (apparently rspec 2 didn't enforce access controls?). Please do not
+  # treat these as part of a public API.
+  # Possible future improvement: rewrite to not require access to private methods.
+  public :skip?
+  public :missing_tags?
+
 end
 
 require 'puppet/transaction/report'

data/lib/puppet/type/augeas.rb

@@ -104,6 +104,7 @@ Puppet::Type.newtype(:augeas) do
     * `remove <PATH>` --- Synonym for `rm`
     * `clear <PATH>` --- Sets the node at `PATH` to `NULL`, creating it if needed
     * `clearm <PATH> <SUB>` --- Sets multiple nodes (matching `SUB` relative to `PATH`) to `NULL`
+    * `touch <PATH>` --- Creates `PATH` with the value `NULL` if it does not exist
     * `ins <LABEL> (before|after) <PATH>` --- Inserts an empty node `LABEL` either before or after `PATH`.
     * `insert <LABEL> <WHERE> <PATH>` --- Synonym for `ins`
     * `mv <PATH> <OTHER PATH>` --- Moves a node at `PATH` to the new location `OTHER PATH`

data/lib/puppet/type/exec.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:exec) do
+  Type.newtype(:exec) do
     include Puppet::Util::Execution
     require 'timeout'
 
@@ -297,7 +297,7 @@ module Puppet
       desc "The number of times execution of the command should be tried.
         Defaults to '1'. This many attempts will be made to execute
         the command until an acceptable return code is returned.
-        Note that the timeout paramater applies to each try rather than
+        Note that the timeout parameter applies to each try rather than
         to the complete set of tries."
 
       munge do |value|

data/lib/puppet/type/file/content.rb

@@ -1,9 +1,11 @@
 require 'net/http'
 require 'uri'
 require 'tempfile'
+require 'date'
 
 require 'puppet/util/checksums'
 require 'puppet/network/http'
+require 'puppet/network/http/api/indirected_routes'
 require 'puppet/network/http/compression'
 
 module Puppet
@@ -72,19 +74,6 @@ module Puppet
       end
     end
 
-    def checksum_type
-      if source = resource.parameter(:source)
-        result = source.checksum
-      else
-        result = resource[:checksum]
-      end
-      if result =~ /^\{(\w+)\}.+/
-        return $1.to_sym
-      else
-        return result
-      end
-    end
-
     def length
       (actual_content and actual_content.length) || 0
     end
@@ -118,6 +107,21 @@ module Puppet
       result
     end
 
+    def property_matches?(current, desired)
+      basic = super
+      # The inherited equality is always accepted, so use it if valid.
+      time_types = [:mtime, :ctime]
+      checksum_type = resource.parameter(:checksum).value
+      return basic if basic || !time_types.include?(checksum_type)
+      return false unless current && desired
+      begin
+        raise if !time_types.include?(sumtype(current).to_sym) || !time_types.include?(sumtype(desired).to_sym)
+        DateTime.parse(sumdata(current)) >= DateTime.parse(sumdata(desired))
+      rescue => detail
+        self.fail Puppet::Error, "Resource with checksum_type #{checksum_type} didn't contain a date in #{current} or #{desired}", detail.backtrace
+      end
+    end
+
     def retrieve
       return :absent unless stat = @resource.stat
       ftype = stat.ftype
@@ -208,11 +212,11 @@ module Puppet
 
     def get_from_source(source_or_content, &block)
       source = source_or_content.metadata.source
-      request = Puppet::Indirector::Request.new(:file_content, :find, source, nil, :environment => resource.catalog.environment)
+      request = Puppet::Indirector::Request.new(:file_content, :find, source, nil, :environment => resource.catalog.environment_instance)
 
       request.do_request(:fileserver) do |req|
         connection = Puppet::Network::HttpPool.http_instance(req.server, req.port)
-        connection.request_get(Puppet::Network::HTTP::API::V1.indirection2uri(req), add_accept_encoding({"Accept" => "raw"}), &block)
+        connection.request_get(Puppet::Network::HTTP::API::IndirectedRoutes.request_to_uri(req), add_accept_encoding({"Accept" => "binary"}), &block)
       end
     end
 

data/lib/puppet/type/file/mode.rb

@@ -10,7 +10,7 @@ module Puppet
 
     desc <<-'EOT'
       The desired permissions mode for the file, in symbolic or numeric
-      notation. This value should be specified as a quoted string; do not use
+      notation. This value **must** be specified as a string; do not use
       un-quoted numbers to represent file modes.
 
       The `file` type uses traditional Unix permission schemes and translates
@@ -19,16 +19,22 @@ module Puppet
       you can leave `mode` unmanaged and use
       [the puppetlabs/acl module.](https://forge.puppetlabs.com/puppetlabs/acl)
 
-      Numeric modes should use the standard four-digit octal notation of
-      `<setuid/setgid/sticky><owner><group><other>` (e.g. 0644). Each of the
-      "owner," "group," and "other" digits should be a sum of the
-      permissions for that class of users, where read = 4, write = 2, and
-      execute/search = 1. When setting numeric permissions for
-      directories, Puppet sets the search permission wherever the read
-      permission is set.
+      Numeric modes should use the standard octal notation of
+      `<SETUID/SETGID/STICKY><OWNER><GROUP><OTHER>` (e.g. '0644').
+
+      * Each of the "owner," "group," and "other" digits should be a sum of the
+        permissions for that class of users, where read = 4, write = 2, and
+        execute/search = 1.
+      * The setuid/setgid/sticky digit is also a sum, where setuid = 4, setgid = 2,
+        and sticky = 1.
+      * The setuid/setgid/sticky digit is optional. If it is absent, Puppet will
+        clear any existing setuid/setgid/sticky permissions. (So to make your intent
+        clear, you should use at least four digits for numeric modes.)
+      * When specifying numeric permissions for directories, Puppet sets the search
+        permission wherever the read permission is set.
 
       Symbolic modes should be represented as a string of comma-separated
-      permission clauses, in the form `<who><op><perm>`:
+      permission clauses, in the form `<WHO><OP><PERM>`:
 
       * "Who" should be u (user), g (group), o (other), and/or a (all)
       * "Op" should be = (set exact permissions), + (add select permissions),
@@ -66,8 +72,7 @@ module Puppet
 
     validate do |value|
       if !value.is_a?(String)
-        Puppet.deprecation_warning("Non-string values for the file mode property are deprecated. It must be a string, " \
-          "either a symbolic mode like 'o+w,a+r' or an octal representation like '0644' or '755'.")
+        raise Puppet::Error, "The file mode specification must be a string, not '#{value.class.name}'"
       end
       unless value.nil? or valid_symbolic_mode?(value)
         raise Puppet::Error, "The file mode specification is invalid: #{value.inspect}"

data/lib/puppet/type/file/selcontext.rb

@@ -6,7 +6,7 @@
 # drwxr-xr-x  root root system_u:object_r:root_t         /
 #
 # The context of '/' here is 'system_u:object_r:root_t'.  This is
-# three seperate fields:
+# three separate fields:
 #
 # system_u is the user context
 # object_r is the role context