puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

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

@@ -22,7 +22,7 @@ module Puppet
       With very small files, you can construct content strings directly in
       the manifest...
 
-          define resolve(nameserver1, nameserver2, domain, search) {
+          define resolve($nameserver1, $nameserver2, $domain, $search) {
               $str = "search ${search}
                   domain ${domain}
                   nameserver ${nameserver1}

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

@@ -10,7 +10,7 @@ module Puppet
       On Windows, a user (such as "Administrator") can be set as a file's group
       and a group (such as "Administrators") can be set as a file's owner;
       however, a file's owner and group shouldn't be the same. (If the owner
-      is also the group, files with modes like `0640` will cause log churn, as
+      is also the group, files with modes like `"0640"` will cause log churn, as
       they will always appear out of sync.)
     EOT
 
@@ -31,11 +31,11 @@ module Puppet
 
     # We want to print names, not numbers
     def is_to_s(currentvalue)
-      provider.gid2name(currentvalue) || currentvalue
+      super(provider.gid2name(currentvalue) || currentvalue)
     end
 
     def should_to_s(newvalue)
-      provider.gid2name(newvalue) || newvalue
+      super(provider.gid2name(newvalue) || newvalue)
     end
   end
 end

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

@@ -24,7 +24,7 @@ module Puppet
       [the puppetlabs/acl module.](https://forge.puppetlabs.com/puppetlabs/acl)
 
       Numeric modes should use the standard octal notation of
-      `<SETUID/SETGID/STICKY><OWNER><GROUP><OTHER>` (e.g. '0644').
+      `<SETUID/SETGID/STICKY><OWNER><GROUP><OTHER>` (for example, "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
@@ -54,7 +54,7 @@ module Puppet
           * g (group's current permissions)
           * o (other's current permissions)
 
-      Thus, mode `0664` could be represented symbolically as either `a=r,ug+w`
+      Thus, mode `"0664"` could be represented symbolically as either `a=r,ug+w`
       or `ug=rw,o=r`.  However, symbolic modes are more expressive than numeric
       modes: a mode only affects the specified bits, so `mode => 'ug+w'` will
       set the user and group write bits, without affecting any other bits.
@@ -70,8 +70,8 @@ module Puppet
         `FILE_GENERIC_WRITE`, and `FILE_GENERIC_EXECUTE` access rights; a
         file's owner always has the `FULL_CONTROL` right
       * "Other" users can't have any permissions a file's group lacks,
-        and its group can't have any permissions its owner lacks; that is, 0644
-        is an acceptable mode, but 0464 is not.
+        and its group can't have any permissions its owner lacks; that is, "0644"
+        is an acceptable mode, but "0464" is not.
     EOT
 
     validate do |value|
@@ -161,7 +161,7 @@ module Puppet
     end
 
     def should_to_s(should_value)
-      should_value.rjust(4, "0")
+      "'#{should_value.rjust(4, '0')}'"
     end
 
     def is_to_s(currentvalue)
@@ -170,7 +170,7 @@ module Puppet
         # present to absent the mode will have a value of `:absent`.
         super
       else
-        currentvalue.rjust(4, "0")
+        "'#{currentvalue.rjust(4, '0')}'"
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Puppet
       On Windows, a group (such as "Administrators") can be set as a file's owner
       and a user (such as "Administrator") can be set as a file's group; however,
       a file's owner and group shouldn't be the same. (If the owner is also
-      the group, files with modes like `0640` will cause log churn, as they
+      the group, files with modes like `"0640"` will cause log churn, as they
       will always appear out of sync.)
     EOT
 
@@ -33,11 +33,11 @@ module Puppet
 
     # We want to print names, not numbers
     def is_to_s(currentvalue)
-      provider.uid2name(currentvalue) || currentvalue
+      super(provider.uid2name(currentvalue) || currentvalue)
     end
 
     def should_to_s(newvalue)
-      provider.uid2name(newvalue) || newvalue
+      super(provider.uid2name(newvalue) || newvalue)
     end
   end
 end

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

@@ -29,7 +29,12 @@ module Puppet
     def retrieve
       return :absent unless @resource.stat
       context = self.get_selinux_current_context(@resource[:path])
-      parse_selinux_context(name, context)
+      is = parse_selinux_context(name, context)
+      if name == :selrange and selinux_support?
+        self.selinux_category_to_label(is)
+      else
+        is
+      end
     end
 
     def retrieve_default_context(property)
@@ -58,6 +63,18 @@ module Puppet
       end
     end
 
+    def unsafe_munge(should)
+      if not selinux_support?
+        return should
+      end
+
+      if name == :selrange
+        self.selinux_category_to_label(should)
+      else
+        should
+      end
+    end
+
     def sync
       self.set_selinux_context(@resource[:path], @should, name)
       :file_changed

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

@@ -16,6 +16,10 @@ module Puppet
   Puppet::Type.type(:file).newparam(:source) do
     include Puppet::Network::HTTP::Compression.module
 
+    BINARY_MIME_TYPES = [
+      Puppet::Network::FormatHandler.format_for('binary').mime
+    ].join(', ').freeze
+
     attr_accessor :source, :local
     desc <<-'EOT'
       A source file, which will be copied into place on the local system. This
@@ -295,7 +299,7 @@ module Puppet
 
       request.do_request(:fileserver) do |req|
         connection = Puppet::Network::HttpPool.http_instance(req.server, req.port)
-        connection.request_get(Puppet::Network::HTTP::API::IndirectedRoutes.request_to_uri(req), add_accept_encoding({"Accept" => "binary"}), &block)
+        connection.request_get(Puppet::Network::HTTP::API::IndirectedRoutes.request_to_uri(req), add_accept_encoding({"Accept" => BINARY_MIME_TYPES}), &block)
       end
     end
 

data/lib/puppet/type/filebucket.rb

@@ -17,11 +17,6 @@ module Puppet
         details. These backups can be used for manual recovery of content, but
         are more commonly used to display changes and differences in a tool like
         Puppet Dashboard.
-      - **Content distribution.** The optional static compiler populates the
-        puppet master's filebucket with the _desired_ content for each file,
-        then instructs the agent to retrieve the content for a specific
-        checksum. For more details,
-        [see the `static_compiler` section in the catalog indirection docs](https://docs.puppetlabs.com/puppet/latest/reference/indirection.html#catalog).
 
       To use a central filebucket for backups, you will usually want to declare
       a filebucket resource and a resource default for the `backup` attribute
@@ -71,11 +66,11 @@ module Puppet
 
       validate do |value|
         if value.is_a? Array
-          raise ArgumentError, "You can only have one filebucket path"
+          raise ArgumentError, _("You can only have one filebucket path")
         end
 
         if value.is_a? String and not Puppet::Util.absolute_path?(value)
-          raise ArgumentError, "Filebucket paths must be absolute"
+          raise ArgumentError, _("Filebucket paths must be absolute")
         end
 
         true
@@ -111,7 +106,7 @@ module Puppet
       begin
         @bucket = Puppet::FileBucket::Dipper.new(args)
       rescue => detail
-        message = "Could not create #{type} filebucket: #{detail}"
+        message = _("Could not create %{type} filebucket: %{detail}") % { type: type, detail: detail }
         self.log_exception(detail, message)
         self.fail(message)
       end

data/lib/puppet/type/group.rb

@@ -66,7 +66,7 @@ module Puppet
           if gid =~ /^[-0-9]+$/
             gid = Integer(gid)
           else
-            self.fail "Invalid GID #{gid}"
+            self.fail _("Invalid GID %{gid}") % { gid: gid }
           end
         when Symbol
           unless gid == :absent
@@ -160,7 +160,7 @@ module Puppet
       end
 
       validate do |value|
-        raise ArgumentError, "Attributes value pairs must be separated by an =" unless value.include?("=")
+        raise ArgumentError, _("Attributes value pairs must be separated by an =") unless value.include?("=")
       end
     end
 

data/lib/puppet/type/host.rb

@@ -29,7 +29,7 @@ module Puppet
 
       validate do |value|
         return true if ((valid_v4?(value) || valid_v6?(value)) && (valid_newline?(value)))
-        raise Puppet::Error, "Invalid IP address #{value.inspect}"
+        raise Puppet::Error, _("Invalid IP address %{value}") % { value: value.inspect }
       end
     end
 
@@ -48,8 +48,8 @@ module Puppet
 
       validate do |value|
         # This regex already includes newline check.
-        raise Puppet::Error, "Host aliases cannot include whitespace" if value =~ /\s/
-        raise Puppet::Error, "Host aliases cannot be an empty string. Use an empty array to delete all host_aliases " if value =~ /^\s*$/
+        raise Puppet::Error, _("Host aliases cannot include whitespace") if value =~ /\s/
+        raise Puppet::Error, _("Host aliases cannot be an empty string. Use an empty array to delete all host_aliases ") if value =~ /^\s*$/
       end
 
     end
@@ -57,7 +57,7 @@ module Puppet
     newproperty(:comment) do
       desc "A comment that will be attached to the line with a # character."
       validate do |value|
-        raise Puppet::Error, "Comment cannot include newline" if (value =~ /\n/ || value =~ /\r/)
+        raise Puppet::Error, _("Comment cannot include newline") if (value =~ /\n/ || value =~ /\r/)
       end
     end
 
@@ -81,10 +81,10 @@ module Puppet
       validate do |value|
         value.split('.').each do |hostpart|
           unless hostpart =~ /^([\d\w]+|[\d\w][\d\w\-]+[\d\w])$/
-            raise Puppet::Error, "Invalid host name"
+            raise Puppet::Error, _("Invalid host name")
           end
         end
-        raise Puppet::Error, "Hostname cannot include newline" if (value =~ /\n/ || value =~ /\r/)
+        raise Puppet::Error, _("Hostname cannot include newline") if (value =~ /\n/ || value =~ /\r/)
       end
     end
 

data/lib/puppet/type/interface.rb

@@ -94,7 +94,7 @@ Puppet::Type.newtype(:interface) do
       validate do |values|
         values = [values] unless values.is_a?(Array)
         values.each do |value|
-          self.fail "Invalid interface ip address" unless parse(value.gsub(/\s*(eui-64|link-local)\s*$/,''))
+          self.fail _("Invalid interface ip address") unless parse(value.gsub(/\s*(eui-64|link-local)\s*$/,''))
         end
       end
 

data/lib/puppet/type/k5login.rb

@@ -20,7 +20,7 @@ Puppet::Type.newtype(:k5login) do
 
     validate do |value|
       unless absolute_path?(value)
-        raise Puppet::Error, "File paths must be fully qualified."
+        raise Puppet::Error, _("File paths must be fully qualified.")
       end
     end
   end

data/lib/puppet/type/macauthorization.rb

@@ -31,7 +31,7 @@ Puppet::Type.newtype(:macauthorization) do
   def munge_integer(value)
       Integer(value)
   rescue ArgumentError
-      fail("munge_integer only takes integers")
+      fail _("munge_integer only takes integers")
   end
 
   newparam(:name) do

data/lib/puppet/type/mailalias.rb

@@ -12,22 +12,6 @@ module Puppet
       desc "Where email should be sent.  Multiple values
         should be specified as an array.  The file and the
         recipient entries are mutually exclusive."
-
-      def is_to_s(value)
-        if value.include?(:absent)
-          super
-        else
-          value.join(",")
-        end
-      end
-
-      def should_to_s(value)
-        if value.include?(:absent)
-          super
-        else
-          value.join(",")
-        end
-      end
     end
 
     newproperty(:file) do
@@ -36,7 +20,7 @@ module Puppet
 
       validate do |value|
 	unless Puppet::Util.absolute_path?(value)
-	  fail Puppet::Error, "File paths must be fully qualified, not '#{value}'"
+	  fail Puppet::Error, _("File paths must be fully qualified, not '%{value}'") % { value: value }
 	end
       end
     end
@@ -55,7 +39,7 @@ module Puppet
 
     validate do
       if self[:recipient] && self[:file]
-	self.fail "You cannot specify both a recipient and a file"
+	self.fail _("You cannot specify both a recipient and a file")
       end
     end
   end

data/lib/puppet/type/maillist.rb

@@ -11,7 +11,7 @@ module Puppet
       end
 
       def change_to_s(current_value, newvalue)
-        return "Purged #{resource}" if newvalue == :purged
+        return _("Purged %{resource}") % { resource: resource } if newvalue == :purged
         super
       end
 

data/lib/puppet/type/mount.rb

@@ -65,7 +65,7 @@ module Puppet
                      # the wrong attributes so I sync AFTER the umount
           return :mount_unmounted
         else
-          raise Puppet::Error, "Unexpected change from #{current_value} to unmounted}"
+          raise Puppet::Error, _("Unexpected change from %{current} to unmounted}") % { current: current_value }
         end
       end
 
@@ -131,7 +131,7 @@ module Puppet
         path, depending on the operating system."
 
       validate do |value|
-        raise Puppet::Error, "device must not contain whitespace: #{value}" if value =~ /\s/
+        raise Puppet::Error, _("device must not contain whitespace: %{value}") % { value: value } if value =~ /\s/
       end
     end
 
@@ -157,7 +157,7 @@ module Puppet
       end
 
       validate do |value|
-        raise Puppet::Error, "blockdevice must not contain whitespace: #{value}" if value =~ /\s/
+        raise Puppet::Error, _("blockdevice must not contain whitespace: %{value}") % { value: value } if value =~ /\s/
       end
     end
 
@@ -166,8 +166,8 @@ module Puppet
         operating system.  This is a required option."
 
       validate do |value|
-        raise Puppet::Error, "fstype must not contain whitespace: #{value}" if value =~ /\s/
-        raise Puppet::Error, "fstype must not be an empty string" if value.empty?
+        raise Puppet::Error, _("fstype must not contain whitespace: %{value}") % { value: value } if value =~ /\s/
+        raise Puppet::Error, _("fstype must not be an empty string") if value.empty?
       end
     end
 
@@ -177,8 +177,8 @@ module Puppet
         Consult the fstab(5) man page for system-specific details."
 
       validate do |value|
-        raise Puppet::Error, "options must not contain whitespace: #{value}" if value =~ /\s/
-        raise Puppet::Error, "options must not be an empty string" if value.empty?
+        raise Puppet::Error, _("options must not contain whitespace: %{value}") % { value: value } if value =~ /\s/
+        raise Puppet::Error, _("options must not be an empty string") if value.empty?
       end
     end
 
@@ -243,7 +243,7 @@ module Puppet
       isnamevar
 
       validate do |value|
-        raise Puppet::Error, "name must not contain whitespace: #{value}" if value =~ /\s/
+        raise Puppet::Error, _("name must not contain whitespace: %{value}") % { value: value } if value =~ /\s/
       end
 
       munge do |value|

data/lib/puppet/type/notify.rb

@@ -6,6 +6,8 @@ module Puppet
   Type.newtype(:notify) do
     @doc = "Sends an arbitrary message to the agent run-time log."
 
+    apply_to_all
+
     newproperty(:message, :idempotent => false) do
       desc "The message to be sent to the log."
       def sync

data/lib/puppet/type/package.rb

@@ -111,7 +111,7 @@ module Puppet
         begin
           provider.update
         rescue => detail
-          self.fail Puppet::Error, "Could not update: #{detail}", detail
+          self.fail Puppet::Error, _("Could not update: %{detail}") % { detail: detail }, detail
         end
 
         if current == :absent
@@ -125,7 +125,7 @@ module Puppet
         begin
           provider.install
         rescue => detail
-          self.fail Puppet::Error, "Could not update: #{detail}", detail
+          self.fail Puppet::Error, _("Could not update: %{detail}") % { detail: detail }, detail
         end
 
         if self.retrieve == :absent
@@ -160,7 +160,7 @@ module Puppet
                 @latest = provider.latest
                 @lateststamp = Time.now.to_i
               rescue => detail
-                error = Puppet::Error.new("Could not get latest version: #{detail}")
+                error = Puppet::Error.new(_("Could not get latest version: %{detail}") % { detail: detail })
                 error.set_backtrace(detail.backtrace)
                 raise error
               end
@@ -206,7 +206,7 @@ module Puppet
       # Provide a bit more information when logging upgrades.
       def should_to_s(newvalue = @should)
         if @latest
-          @latest.to_s
+          super(@latest)
         else
           super(newvalue)
         end
@@ -260,7 +260,7 @@ module Puppet
 
       validate do |value|
         if !value.is_a?(String)
-          raise ArgumentError, "Name must be a String not #{value.class}"
+          raise ArgumentError, _("Name must be a String not %{klass}") % { klass: value.class }
         end
       end
     end

data/lib/puppet/type/resources.rb

@@ -12,7 +12,7 @@ Puppet::Type.newtype(:resources) do
     desc "The name of the type to be managed."
 
     validate do |name|
-      raise ArgumentError, "Could not find resource type '#{name}'" unless Puppet::Type.type(name)
+      raise ArgumentError, _("Could not find resource type '%{name}'") % { name: name } unless Puppet::Type.type(name)
     end
 
     munge { |v| v.to_s }
@@ -30,9 +30,9 @@ Puppet::Type.newtype(:resources) do
     validate do |value|
       if munge(value)
         unless @resource.resource_type.respond_to?(:instances)
-          raise ArgumentError, "Purging resources of type #{@resource[:name]} is not supported, since they cannot be queried from the system"
+          raise ArgumentError, _("Purging resources of type %{res_type} is not supported, since they cannot be queried from the system") % { res_type: @resource[:name] }
         end
-        raise ArgumentError, "Purging is only supported on types that accept 'ensure'" unless @resource.resource_type.validproperty?(:ensure)
+        raise ArgumentError, _("Purging is only supported on types that accept 'ensure'") unless @resource.resource_type.validproperty?(:ensure)
       end
     end
   end
@@ -54,7 +54,7 @@ Puppet::Type.newtype(:resources) do
         false
       when Integer; value
       else
-        raise ArgumentError, "Invalid value #{value.inspect}"
+        raise ArgumentError, _("Invalid value %{value}") % { value: value.inspect }
       end
     end
 
@@ -81,7 +81,7 @@ Puppet::Type.newtype(:resources) do
           when String
             Integer(v)
           else
-            raise ArgumentError, "Invalid value #{v.inspect}."
+            raise ArgumentError, _("Invalid value %{value}.") % { value: v.inspect }
         end
       end
     end
@@ -100,7 +100,7 @@ Puppet::Type.newtype(:resources) do
   def able_to_ensure_absent?(resource)
       resource[:ensure] = :absent
   rescue ArgumentError, Puppet::Error
-      err "The 'ensure' attribute on #{self[:name]} resources does not accept 'absent' as a value"
+      err _("The 'ensure' attribute on %{name} resources does not accept 'absent' as a value") % { name: self[:name] }
       false
   end