puppet 3.8.7 → 4.0.0

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

@@ -26,8 +26,8 @@ module Puppet
 
       This will fetch a file from a module on the puppet master (or from a
       local module when using puppet apply). Given a `modulepath` of
-      `/etc/puppetlabs/puppet/modules`, the example above would resolve to
-      `/etc/puppetlabs/puppet/modules/name_of_module/files/filename`.
+      `/etc/puppetlabs/code/modules`, the example above would resolve to
+      `/etc/puppetlabs/code/modules/name_of_module/files/filename`.
 
       Unlike `content`, the `source` attribute can be used to recursively copy
       directories if the `recurse` attribute is set to `true` or `remote`. If
@@ -100,7 +100,7 @@ module Puppet
       return @content if @content
       raise Puppet::DevError, "No source for content was stored with the metadata" unless metadata.source
 
-      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment, :links => resource[:links])
+      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment_instance, :links => resource[:links])
         self.fail "Could not find any content at %s" % metadata.source
       end
       @content = tmp.content
@@ -127,11 +127,10 @@ module Puppet
           if [:use, :use_when_creating].include?(resource[:source_permissions]) &&
             (resource[:owner] == nil || resource[:group] == nil || resource[:mode] == nil)
 
-            warning = "Copying %s from the source" <<
-                      " file on Windows is deprecated;" <<
+            err_msg = "Copying %s from the source" <<
+                      " file on Windows is not supported;" <<
                       " use source_permissions => ignore."
-            Puppet.deprecation_warning(warning % 'owner/mode/group')
-            resource.debug(warning % metadata_method.to_s)
+            self.fail Puppet::Error, err_msg % 'owner/mode/group'
           end
           # But never try to copy remote owner/group on Windows
           next if [:owner, :group].include?(metadata_method) && !local?
@@ -172,6 +171,7 @@ module Puppet
           options = {
             :environment          => resource.catalog.environment_instance,
             :links                => resource[:links],
+            :checksum_type        => resource[:checksum],
             :source_permissions   => resource[:source_permissions]
           }
 
@@ -240,20 +240,20 @@ module Puppet
       specified. (In all cases, explicit permissions will take precedence.)
       Valid values are `use`, `use_when_creating`, and `ignore`:
 
-      * `use` (the default) will cause Puppet to apply the owner, group,
+      * `ignore` (the default) will never apply the owner, group, or mode from
+        the `source` when managing a file. When creating new files without explicit
+        permissions, the permissions they receive will depend on platform-specific
+        behavior. On POSIX, Puppet will use the umask of the user it is running as.
+        On Windows, Puppet will use the default DACL associated with the user it is
+        running as.
+      * `use` will cause Puppet to apply the owner, group,
         and mode from the `source` to any files it is managing.
       * `use_when_creating` will only apply the owner, group, and mode from the
         `source` when creating a file; existing files will not have their permissions
         overwritten.
-      * `ignore` will never apply the owner, group, or mode from the `source` when
-        managing a file. When creating new files without explicit permissions,
-        the permissions they receive will depend on platform-specific behavior.
-        On POSIX, Puppet will use the umask of the user it is running as. On
-        Windows, Puppet will use the default DACL associated with the user it is
-        running as.
     EOT
 
-    defaultto :use
+    defaultto :ignore
     newvalues(:use, :use_when_creating, :ignore)
   end
 end

data/lib/puppet/type/file.rb

@@ -90,7 +90,7 @@ Puppet::Type.newtype(:file) do
       filebucket resource and a resource default for the `backup` attribute
       in site.pp:
 
-          # /etc/puppet/manifests/site.pp
+          # /etc/puppetlabs/puppet/manifests/site.pp
           filebucket { 'main':
             path   => false,                # This is required for remote filebuckets.
             server => 'puppet.example.com', # Optional; defaults to the configured puppet master.
@@ -148,20 +148,18 @@ Puppet::Type.newtype(:file) do
         The `source` attribute is not mandatory when using `recurse => true`, so you
         can enable purging in directories where all files are managed individually.
 
-        (Note: `inf` is a deprecated synonym for `true`.)
-
       By default, setting recurse to `remote` or `true` will manage _all_
       subdirectories. You can use the `recurselimit` attribute to limit the
       recursion depth.
     "
 
-    newvalues(:true, :false, :inf, :remote)
+    newvalues(:true, :false, :remote)
 
     validate { |arg| }
     munge do |value|
       newval = super(value)
       case newval
-      when :true, :inf; true
+      when :true; true
       when :false; false
       when :remote; :remote
       else
@@ -381,6 +379,11 @@ Puppet::Type.newtype(:file) do
 
     self.warning "Possible error: recurselimit is set but not recurse, no recursion will happen" if !self[:recurse] and self[:recurselimit]
 
+    if @parameters[:content] && @parameters[:content].actual_content
+      # Now that we know the checksum, update content (in case it was created before checksum was known).
+      @parameters[:content].value = @parameters[:checksum].sum(@parameters[:content].actual_content)
+    end
+
     provider.validate if provider.respond_to?(:validate)
   end
 
@@ -653,10 +656,6 @@ Puppet::Type.newtype(:file) do
       end
       children[meta.relative_path] ||= newchild(meta.relative_path)
       children[meta.relative_path][:source] = meta.source
-      if meta.ftype == "file"
-        children[meta.relative_path][:checksum] = Puppet[:digest_algorithm].to_sym
-      end
-
       children[meta.relative_path].parameter(:source).metadata = meta
     end
 

data/lib/puppet/type/filebucket.rb

@@ -1,7 +1,7 @@
 module Puppet
   require 'puppet/file_bucket/dipper'
 
-  newtype(:filebucket) do
+  Type.newtype(:filebucket) do
     @doc = <<-EOT
       A repository for storing and retrieving file content by MD5 checksum. Can
       be local to each agent node, or centralized on a puppet master server. All
@@ -27,7 +27,7 @@ module Puppet
       a filebucket resource and a resource default for the `backup` attribute
       in site.pp:
 
-          # /etc/puppet/manifests/site.pp
+          # /etc/puppetlabs/puppet/manifests/site.pp
           filebucket { 'main':
             path   => false,                # This is required for remote filebuckets.
             server => 'puppet.example.com', # Optional; defaults to the configured puppet master.

data/lib/puppet/type/group.rb

@@ -4,7 +4,7 @@ require 'puppet/property/keyvalue'
 require 'puppet/parameter/boolean'
 
 module Puppet
-  newtype(:group) do
+  Type.newtype(:group) do
     @doc = "Manage groups. On most platforms this can only create groups.
       Group membership must be managed on individual users.
 
@@ -80,9 +80,7 @@ module Puppet
 
     newproperty(:members, :array_matching => :all, :required_features => :manages_members) do
       desc "The members of the group. For directory services where group
-      membership is stored in the group objects, not the users. Use
-      with auth_membership to determine whether the specified members
-      are inclusive or the minimum."
+      membership is stored in the group objects, not the users."
 
       def change_to_s(currentvalue, newvalue)
         currentvalue = currentvalue.join(",") if currentvalue != :absent
@@ -101,27 +99,17 @@ module Puppet
       def is_to_s(currentvalue)
         if provider.respond_to?(:members_to_s)
           currentvalue = '' if currentvalue.nil?
-          currentvalue = currentvalue.is_a?(Array) ? currentvalue : currentvalue.split(',')
-
-          return provider.members_to_s(currentvalue)
+          return provider.members_to_s(currentvalue.split(','))
         end
 
         super(currentvalue)
       end
       alias :should_to_s :is_to_s
-
-      validate do |value|
-        if provider.respond_to?(:member_valid?)
-          return provider.member_valid?(value)
-        end
-      end
     end
 
     newparam(:auth_membership, :boolean => true, :parent => Puppet::Parameter::Boolean) do
-      desc "Whether the provider is authoritative for group membership. This
-        must be set to true to allow setting the group to no members with
-        `members => [],`."
-      defaultto true
+      desc "whether the provider is authoritative for group membership."
+      defaultto false
     end
 
     newparam(:name) do

data/lib/puppet/type/host.rb

@@ -1,7 +1,7 @@
 require 'puppet/property/ordered_list'
 
 module Puppet
-  newtype(:host) do
+  Type.newtype(:host) do
     ensurable
 
     newproperty(:ip) do
@@ -22,9 +22,13 @@ module Puppet
 
         return false
       end
+      def valid_newline?(addr)
+        return false if (addr =~ /\n/ || addr =~ /\r/)
+        return true
+      end
 
       validate do |value|
-        return true if valid_v4?(value) or valid_v6?(value)
+        return true if ((valid_v4?(value) || valid_v6?(value)) && (valid_newline?(value)))
         raise Puppet::Error, "Invalid IP address #{value.inspect}"
       end
     end
@@ -43,14 +47,18 @@ module Puppet
       end
 
       validate do |value|
+        # This regex already includes newline check.
         raise Puppet::Error, "Host aliases cannot include whitespace" if value =~ /\s/
-        raise Puppet::Error, "Host alias cannot be an empty string. Use an empty array to delete all host_aliases " 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
 
     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/)
+      end
     end
 
     newproperty(:target) do
@@ -76,6 +84,7 @@ module Puppet
             raise Puppet::Error, "Invalid host name"
           end
         end
+        raise Puppet::Error, "Hostname cannot include newline" if (value =~ /\n/ || value =~ /\r/)
       end
     end
 

data/lib/puppet/type/k5login.rb

@@ -55,7 +55,7 @@ Puppet::Type.newtype(:k5login) do
     end
 
     # Return the principals
-    def principals(dummy_argument=:work_arround_for_ruby_GC_bug)
+    def principals
       if Puppet::FileSystem.exist?(@resource[:name])
         File.readlines(@resource[:name]).collect { |line| line.chomp }
       else

data/lib/puppet/type/mailalias.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:mailalias) do
+  Type.newtype(:mailalias) do
     @doc = "Creates an email alias in the local alias database."
 
     ensurable
@@ -10,7 +10,8 @@ module Puppet
 
     newproperty(:recipient, :array_matching => :all) do
       desc "Where email should be sent.  Multiple values
-        should be specified as an array."
+        should be specified as an array.  The file and the
+        recipient entries are mutually exclusive."
 
       def is_to_s(value)
         if value.include?(:absent)
@@ -20,10 +21,6 @@ module Puppet
         end
       end
 
-      def should
-        @should
-      end
-
       def should_to_s(value)
         if value.include?(:absent)
           super
@@ -33,6 +30,17 @@ module Puppet
       end
     end
 
+    newproperty(:file) do
+      desc "A file containing the alias's contents.  The file and the
+        recipient entries are mutually exclusive."
+
+      validate do |value|
+	unless Puppet::Util.absolute_path?(value)
+	  fail Puppet::Error, "File paths must be fully qualified, not '#{value}'"
+	end
+      end
+    end
+
     newproperty(:target) do
       desc "The file in which to store the aliases.  Only used by
         those providers that write to disk."
@@ -44,5 +52,11 @@ module Puppet
         end
       }
     end
+
+    validate do
+      if self[:recipient] && self[:file]
+	self.fail "You cannot specify both a recipient and a file"
+      end
+    end
   end
 end

data/lib/puppet/type/maillist.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:maillist) do
+  Type.newtype(:maillist) do
     @doc = "Manage email lists.  This resource type can only create
       and remove lists; it cannot currently reconfigure them."
 

data/lib/puppet/type/mount.rb

@@ -2,7 +2,7 @@ require 'puppet/property/boolean'
 
 module Puppet
   # We want the mount to refresh when it changes.
-  newtype(:mount, :self_refresh => true) do
+  Type.newtype(:mount, :self_refresh => true) do
     @doc = "Manages mounted filesystems, including putting mount
       information into the mount table. The actual behavior depends
       on the value of the 'ensure' parameter.
@@ -168,14 +168,12 @@ module Puppet
     end
 
     newproperty(:options) do
-      desc "Mount options for the mounts, comma-separated as they would appear
-      in the fstab on Linux. AIX options other than dev, nodename, or vfs may
-      be defined here. If specified, AIX options of account, boot, check, free,
-      mount, size, type, vol, log, and quota must be alphabetically sorted at
-      the end of the list."
+      desc "A single string containing options for the mount, as they would
+        appear in fstab. For many platforms this is a comma delimited string.
+        Consult the fstab(5) man page for system-specific details."
 
       validate do |value|
-        raise Puppet::Error, "option must not contain whitespace: #{value}" if value =~ /\s/
+        raise Puppet::Error, "options must not contain whitespace: #{value}" if value =~ /\s/
       end
     end
 
@@ -256,16 +254,8 @@ module Puppet
       newvalues(:true, :false)
       defaultto do
         case Facter.value(:operatingsystem)
-        when "FreeBSD", "Darwin", "DragonFly", "OpenBSD"
+        when "FreeBSD", "Darwin", "AIX", "DragonFly", "OpenBSD"
           false
-        when "AIX"
-          if Facter.value(:kernelmajversion) == "5300"
-            false
-          elsif resource[:device] and resource[:device].match(%r{^[^/]+:/})
-            false
-          else
-            true
-          end
         else
           true
         end

data/lib/puppet/type/notify.rb

@@ -3,7 +3,7 @@
 
 
 module Puppet
-  newtype(:notify) do
+  Type.newtype(:notify) do
     @doc = "Sends an arbitrary message to the agent run-time log."
 
     newproperty(:message) do

data/lib/puppet/type/package.rb

@@ -7,7 +7,7 @@ require 'puppet/parameter/package_options'
 require 'puppet/parameter/boolean'
 
 module Puppet
-  newtype(:package) do
+  Type.newtype(:package) do
     @doc = "Manage packages.  There is a basic dichotomy in package
       support right now:  Some package types (e.g., yum and apt) can
       retrieve their own package files, while others (e.g., rpm and sun)
@@ -20,10 +20,19 @@ module Puppet
       requires in order to function, and you must meet those requirements
       to use a given provider.
 
+      You can declare multiple package resources with the same `name`, as long
+      as they specify different providers and have unique titles.
+
+      Note that you must use the _title_ to make a reference to a package
+      resource; `Package[<NAME>]` is not a synonym for `Package[<TITLE>]` like
+      it is for many other resource types.
+
       **Autorequires:** If Puppet is managing the files specified as a
       package's `adminfile`, `responsefile`, or `source`, the package
       resource will autorequire those files."
 
+    feature :reinstallable, "The provider can reinstall packages.",
+      :methods => [:reinstall]
     feature :installable, "The provider can install packages.",
       :methods => [:install]
     feature :uninstallable, "The provider can uninstall packages.",
@@ -173,6 +182,10 @@ module Puppet
           # supports providers that can have multiple versions installed
           when *Array(is)
             return true
+          else
+            # We have version numbers, and no match. If the provider has
+            # additional logic, run it here.
+            return provider.insync?(is) if provider.respond_to?(:insync?)
           end
         }
 
@@ -197,9 +210,9 @@ module Puppet
     newparam(:name) do
       desc "The package name.  This is the name that the packaging
       system uses internally, which is sometimes (especially on Solaris)
-      a name that is basically useless to humans.  If you want to
-      abstract package installation, then you can use aliases to provide
-      a common name to packages:
+      a name that is basically useless to humans.  If a package goes by
+      several names, you can use a single title and then set the name
+      conditionally:
 
           # In the 'openssl' class
           $ssl = $operatingsystem ? {
@@ -207,11 +220,9 @@ module Puppet
             default => openssl
           }
 
-          # It is not an error to set an alias to the same value as the
-          # object name.
-          package { $ssl:
-            ensure => installed,
-            alias  => openssl
+          package { 'openssl':
+            name   => $ssl,
+            ensure => installed
           }
 
           . etc. .
@@ -221,12 +232,10 @@ module Puppet
             default => openssh
           }
 
-          # Use the alias to specify a dependency, rather than
-          # having another selector to figure it out again.
-          package { $ssh:
+          package { 'openssh':
+            name    => $ssh
             ensure  => installed,
-            alias   => openssh,
-            require => Package[openssl]
+            require => Package['openssl']
           }
 
       "
@@ -239,6 +248,37 @@ module Puppet
       end
     end
 
+    # We call providify here so that we can set provider as a namevar.
+    # Normally this method is called after newtype finishes constructing this
+    # Type class.
+    providify
+    paramclass(:provider).isnamevar
+
+    # We have more than one namevar, so we need title_patterns. However, we
+    # cheat and set the patterns to map to name only and completely ignore
+    # provider. So far, the logic that determines uniqueness appears to just
+    # "Do The Right Thing™" when the provider is explicitly set by the user.
+    #
+    # The following resources will be seen as uniqe by puppet:
+    #
+    #     # Uniqueness Key: ['mysql', nil]
+    #     package{'mysql': }
+    #
+    #     # Uniqueness Key: ['mysql', 'gem']
+    #     package{'gem-mysql':
+    #       name     => 'mysql,
+    #       provider => gem
+    #     }
+    #
+    # This does not handle the case where providers like 'yum' and 'rpm' should
+    # clash. Also, declarations that implicitly use the default provider will
+    # clash with those that explicitly use the default.
+    def self.title_patterns
+      # This is the default title pattern for all types, except hard-wired to
+      # set only name.
+      [ [ /(.*)/m, [ [:name] ] ] ]
+    end
+
     newproperty(:package_settings, :required_features=>:package_settings) do
       desc "Settings that can change the contents or configuration of a package.
 
@@ -438,8 +478,7 @@ module Puppet
     newparam(:allow_virtual, :boolean => true, :parent => Puppet::Parameter::Boolean, :required_features => :virtual_packages) do
       desc 'Specifies if virtual package names are allowed for install and uninstall.'
 
-      # In a future release, this should be defaulted to true
-      defaultto false
+      defaultto true
     end
 
     autorequire(:file) do
@@ -472,5 +511,41 @@ module Puppet
     def present?(current_values)
       super && current_values[:ensure] != :purged
     end
+
+    # This parameter exists to ensure backwards compatibility is preserved.
+    # See https://github.com/puppetlabs/puppet/pull/2614 for discussion.
+    # If/when a metaparameter for controlling how arbitrary resources respond
+    # to refreshing is created, that will supersede this, and this will be
+    # deprecated.
+    newparam(:reinstall_on_refresh) do
+      desc "Whether this resource should respond to refresh events (via `subscribe`,
+        `notify`, or the `~>` arrow) by reinstalling the package. Only works for
+        providers that support the `reinstallable` feature.
+
+        This is useful for source-based distributions, where you may want to
+        recompile a package if the build options change.
+
+        If you use this, be careful of notifying classes when you want to restart
+        services. If the class also contains a refreshable package, doing so could
+        cause unnecessary re-installs.
+
+        Defaults to `false`."
+      newvalues(:true, :false)
+
+      defaultto :false
+    end
+
+    # When a refresh event is triggered, calls reinstall on providers
+    # that support the reinstall_on_refresh parameter.
+    def refresh
+      if provider.reinstallable? &&
+        @parameters[:reinstall_on_refresh].value == :true &&
+        @parameters[:ensure].value != :purged &&
+        @parameters[:ensure].value != :absent &&
+        @parameters[:ensure].value != :held
+
+        provider.reinstall
+      end
+    end
   end
 end

data/lib/puppet/type/resources.rb

@@ -134,13 +134,6 @@ Puppet::Type.newtype(:resources) do
     @resource_type
   end
 
-  def self.deprecate_params(title,params)
-    return unless params
-    if title == 'cron' and ! params.select { |param| param.name.intern == :purge and param.value == true }.empty?
-      Puppet.deprecation_warning("Change notice: purging cron entries will be more aggressive in future versions, take care when updating your agents. See http://links.puppetlabs.com/puppet-aggressive-cron-purge")
-    end
-  end
-
   # Make sure we don't purge users with specific uids
   def user_check(resource)
     return true unless self[:name] == "user"

data/lib/puppet/type/router.rb

@@ -3,7 +3,7 @@
 
 
 module Puppet
-  newtype(:router) do
+  Type.newtype(:router) do
     @doc = "Manages connected router."
 
     newparam(:url) do

data/lib/puppet/type/schedule.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:schedule) do
+  Type.newtype(:schedule) do
     @doc = <<-'EOT'
       Define schedules for Puppet. Resources can be limited to a schedule by using the
       [`schedule`](http://docs.puppetlabs.com/references/latest/metaparameter.html#schedule)

data/lib/puppet/type/scheduled_task.rb

@@ -102,9 +102,6 @@ Puppet::Type.newtype(:scheduled_task) do
           * `start_date` ---  The date when the trigger should first become active.
             Defaults to the current date. You should format dates as YYYY-MM-DD,
             although other date formats may work. (Under the hood, this uses `Date.parse`.)
-          * `minutes_interval` --- The repeat interval in minutes.
-          * `minutes_duration` --- The duration in minutes, needs to be greater than the
-            minutes_interval.
       * For `daily` triggers:
           * `every` --- How often the task should run, as a number of days. Defaults
             to 1. ("2" means every other day, "3" means every three days, etc.)
@@ -130,7 +127,6 @@ Puppet::Type.newtype(:scheduled_task) do
             when the task should run. Must be one of `first`, `second`, `third`,
             `fourth`, `fifth`, or `last`.
 
-
       Examples:
 
           # Run at 8am on the 1st, 15th, and last day of the month in January, March,
@@ -154,15 +150,6 @@ Puppet::Type.newtype(:scheduled_task) do
             day_of_week      => [mon],        # Must be specified
           }
 
-          # Run daily repeating every 30 minutes between 9am and 5pm (480 minutes) starting after August 31st, 2011.
-          trigger => {
-            schedule         => daily,
-            start_date       => '2011-08-31', # Defaults to current date
-            start_time       => '8:00',       # Must be specified
-            minutes_interval => 30,
-            minutes_duration => 480,
-          }
-
     EOT
 
     validate do |value|

data/lib/puppet/type/selboolean.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:selboolean) do
+  Type.newtype(:selboolean) do
     @doc = "Manages SELinux booleans on systems with SELinux support.  The supported booleans
       are any of the ones found in `/selinux/booleans/`."
 
@@ -15,7 +15,7 @@ module Puppet
     end
 
     newparam(:persistent) do
-      desc "If set true, SELinux booleans will be written to disk and persist accross reboots.
+      desc "If set true, SELinux booleans will be written to disk and persist across reboots.
         The default is `false`."
 
       defaultto :false

data/lib/puppet/type/service.rb

@@ -7,7 +7,7 @@
 
 module Puppet
 
-  newtype(:service) do
+  Type.newtype(:service) do
     @doc = "Manage running services.  Service support unfortunately varies
       widely by platform --- some platforms have very little if any concept of a
       running service, and some have a very codified and powerful concept.

data/lib/puppet/type/ssh_authorized_key.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:ssh_authorized_key) do
+  Type.newtype(:ssh_authorized_key) do
     @doc = "Manages SSH authorized keys. Currently only type 2 keys are supported.
 
       In their native habitat, SSH keys usually appear as a single long line. This

data/lib/puppet/type/sshkey.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:sshkey) do
+  Type.newtype(:sshkey) do
     @doc = "Installs and manages ssh host keys.  At this point, this type
       only knows how to install keys into `/etc/ssh/ssh_known_hosts`.  See
       the `ssh_authorized_key` type to manage authorized keys."