puppet 4.2.3 → 4.3.0

data/lib/puppet/pops/types/types_meta.rb

@@ -1,234 +0,0 @@
-require 'rgen/metamodel_builder'
-
-# The Types model is a model of Puppet Language types.
-#
-# The exact relationship between types is not visible in this model wrt. the PDataType which is an abstraction
-# of Scalar, Array[Data], and Hash[Scalar, Data] nested to any depth. This means it is not possible to
-# infer the type by simply looking at the inheritance hierarchy. The {Puppet::Pops::Types::TypeCalculator} should
-# be used to answer questions about types. The {Puppet::Pops::Types::TypeFactory} should be used to create an instance
-# of a type whenever one is needed.
-#
-# The implementation of the Types model contains methods that are required for the type objects to behave as
-# expected when comparing them and using them as keys in hashes. (No other logic is, or should be included directly in
-# the model's classes).
-#
-# @api public
-#
-module Puppet::Pops::Types
-  extend RGen::MetamodelBuilder::ModuleExtension
-
-  class TypeModelObject < RGen::MetamodelBuilder::MMBase
-    abstract
-  end
-
-  # Base type for all types except {Puppet::Pops::Types::PType PType}, the type of types.
-  # @api public
-  #
-  class PAnyType < TypeModelObject
-  end
-
-  # A type that is assignable from the same types as its contained `type` except the
-  # types assignable from {Puppet::Pops::Types::PUndefType}
-  #
-  # @api public
-  #
-  class PNotUndefType < PAnyType
-    contains_one_uni 'type', PAnyType
-  end
-
-  # The type of types.
-  # @api public
-  #
-  class PType < PAnyType
-    contains_one_uni 'type', PAnyType
-  end
-
-  # @api public
-  #
-  class PUndefType < PAnyType
-  end
-
-
-  # A type private to the type system that describes "ignored type" - i.e. "I am what you are"
-  # @api private
-  #
-  class  PUnitType < PAnyType
-  end
-
-  # @api public
-  #
-  class PDefaultType < PAnyType
-  end
-
-  # A flexible data type, being assignable to its subtypes as well as PArrayType and PHashType with element type assignable to PDataType.
-  #
-  # @api public
-  #
-  class PDataType < PAnyType
-  end
-
-  # A flexible type describing an any? of other types
-  # @api public
-  #
-  class PVariantType < PAnyType
-    contains_many_uni 'types', PAnyType, :lowerBound => 1
-  end
-
-  # Type that is PDataType compatible, but is not a PCollectionType.
-  # @api public
-  #
-  class PScalarType < PAnyType
-  end
-
-  # A string type describing the set of strings having one of the given values
-  # @api public
-  #
-  class PEnumType < PScalarType
-    has_many_attr 'values', String, :lowerBound => 1
-  end
-
-  # @api public
-  #
-  class PNumericType < PScalarType
-  end
-
-  # @api public
-  #
-  class PIntegerType < PNumericType
-    has_attr 'from', Integer, :lowerBound => 0
-    has_attr 'to', Integer, :lowerBound => 0
-  end
-
-  # @api public
-  #
-  class PFloatType < PNumericType
-    has_attr 'from', Float, :lowerBound => 0
-    has_attr 'to', Float, :lowerBound => 0
-  end
-
-  # @api public
-  #
-  class PStringType < PScalarType
-    has_many_attr 'values', String, :lowerBound => 0, :upperBound => -1, :unique => true
-    contains_one_uni 'size_type', PIntegerType
-  end
-
-  # @api public
-  #
-  class PRegexpType < PScalarType
-    has_attr 'pattern', String, :lowerBound => 1
-    has_attr 'regexp', Object, :derived => true
-  end
-
-  # Represents a subtype of String that narrows the string to those matching the patterns
-  # If specified without a pattern it is basically the same as the String type.
-  #
-  # @api public
-  #
-  class PPatternType < PScalarType
-    contains_many_uni 'patterns', PRegexpType
-  end
-
-  # @api public
-  #
-  class PBooleanType < PScalarType
-  end
-
-  # @api public
-  #
-  class PCollectionType < PAnyType
-    contains_one_uni 'element_type', PAnyType
-    contains_one_uni 'size_type', PIntegerType
-  end
-
-  # @api public
-  #
-  class PStructElement < TypeModelObject
-    # key_type must be either String[1] or Optional[String[1]] and the String[1] must
-    # have a values collection with exactly one element
-    contains_one_uni 'key_type', PAnyType, :lowerBound => 1
-    contains_one_uni 'value_type', PAnyType
-  end
-
-  # @api public
-  #
-  class PStructType < PAnyType
-    contains_many_uni 'elements', PStructElement, :lowerBound => 1
-    has_attr 'hashed_elements', Object, :derived => true
-  end
-
-  # @api public
-  #
-  class PTupleType < PAnyType
-    contains_many_uni 'types', PAnyType, :lowerBound => 1
-    # If set, describes min and max required of the given types - if max > size of
-    # types, the last type entry repeats
-    #
-    contains_one_uni 'size_type', PIntegerType, :lowerBound => 0
-  end
-
-  # @api public
-  #
-  class PCallableType < PAnyType
-    # Types of parameters as a Tuple with required/optional count, or an Integer with min (required), max count
-    contains_one_uni 'param_types', PAnyType, :lowerBound => 1
-
-    # Although being an abstract type reference, only Callable, or all Callables wrapped in
-    # Optional or Variant are supported
-    # If not set, the meaning is that block is not supported.
-    #
-    contains_one_uni 'block_type', PAnyType, :lowerBound => 0
-  end
-
-  # @api public
-  #
-  class PArrayType < PCollectionType
-  end
-
-  # @api public
-  #
-  class PHashType < PCollectionType
-    contains_one_uni 'key_type', PAnyType
-  end
-
-  RuntimeEnum = RGen::MetamodelBuilder::DataTypes::Enum.new(
-    :name => 'RuntimeEnum',
-    :literals => [:'ruby', ])
-
-  # @api public
-  #
-  class PRuntimeType < PAnyType
-    has_attr 'runtime', RuntimeEnum, :lowerBound => 1
-    has_attr 'runtime_type_name', String
-  end
-
-  # Abstract representation of a type that can be placed in a Catalog.
-  # @api public
-  #
-  class PCatalogEntryType < PAnyType
-  end
-
-  # Represents a (host-) class in the Puppet Language.
-  # @api public
-  #
-  class PHostClassType < PCatalogEntryType
-    has_attr 'class_name', String
-  end
-
-  # Represents a Resource Type in the Puppet Language
-  # @api public
-  #
-  class PResourceType < PCatalogEntryType
-    has_attr 'type_name', String
-    has_attr 'title', String
-  end
-
-  # Represents a type that accept PUndefType instead of the type parameter
-  # required_type - is a short hand for Variant[T, Undef]
-  # @api public
-  #
-  class POptionalType < PAnyType
-    contains_one_uni 'optional_type', PAnyType
-  end
-
-end

data/lib/puppet/pops/validation.rb

@@ -199,8 +199,13 @@ module Puppet::Pops::Validation
       # TODO: this support is questionable, it requires knowledge that :detail is special
       arguments[:detail] ||= ''
 
-      source_pos = Puppet::Pops::Utils.find_closest_positioned(semantic)
-      file = source_pos ? source_pos.locator.file : nil
+      if semantic.is_a?(Puppet::Parser::Resource)
+        source_pos = semantic
+        file = semantic.file
+      else
+        source_pos = Puppet::Pops::Utils.find_closest_positioned(semantic)
+        file = source_pos ? source_pos.locator.file : nil
+      end
 
       severity = @severity_producer.severity(issue)
       @acceptor.accept(Diagnostic.new(severity, issue, file, source_pos, arguments, except))

data/lib/puppet/pops/validation/checker4_0.rb

@@ -195,6 +195,8 @@ class Puppet::Pops::Validation::Checker4_0
     case parent1
     when Model::AbstractResource
     when Model::CollectExpression
+    when Model::CapabilityMapping
+      acceptor.accept(Issues::UNSUPPORTED_OPERATOR_IN_CONTEXT, parent1, :operator=>'* =>')
     else
       # protect against just testing a snippet that has no parent, error message will be a bit strange
       # but it is not for a real program.
@@ -233,6 +235,32 @@ class Puppet::Pops::Validation::Checker4_0
     end
   end
 
+  def check_CapabilityMapping(o)
+    ok =
+    case o.component
+    when Puppet::Pops::Model::QualifiedName
+      name = o.component.value
+      acceptor.accept(Issues::ILLEGAL_CLASSREF, o.component, {:name=>name}) unless name =~ Puppet::Pops::Patterns::CLASSREF_EXT
+      true
+    when Puppet::Pops::Model::AccessExpression
+      keys = o.component.keys
+      expr = o.component.left_expr
+      if expr.is_a?(Puppet::Pops::Model::QualifiedReference) && keys.size == 1
+        key = keys[0]
+        key.is_a?(Puppet::Pops::Model::LiteralString) || key.is_a?(Puppet::Pops::Model::QualifiedName) || key.is_a?(Puppet::Pops::Model::QualifiedReference)
+      else
+        false
+      end
+    else
+      false
+    end
+    acceptor.accept(Issues::ILLEGAL_EXPRESSION, o.component, :feature=>'capability mapping', :container => o) unless ok
+
+    if o.capability !~ Puppet::Pops::Patterns::CLASSREF_EXT
+      acceptor.accept(Issues::ILLEGAL_CLASSREF, o, {:name=>o.capability})
+    end
+  end
+
   def check_EppExpression(o)
     if o.eContainer.is_a?(Puppet::Pops::Model::LambdaExpression)
       internal_check_no_capture(o.eContainer, o)

data/lib/puppet/provider/augeas/augeas.rb

@@ -44,6 +44,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
     "rename" => [ :path, :string ],
     "insert" => [ :string, :string, :path ],
     "get" => [ :path, :comparator, :string ],
+    "values" => [ :path, :glob ],
     "defvar" => [ :string, :path ],
     "defnode" => [ :string, :path, :string ],
     "match" => [ :path, :glob ],
@@ -243,6 +244,54 @@ Puppet::Type.type(:augeas).provide(:augeas) do
     !!return_value
   end
 
+  # Used by the need_to_run? method to process values filters. Returns
+  # true if there is a matched value, false if otherwise
+  def process_values(cmd_array)
+    return_value = false
+
+    #validate and tear apart the command
+    fail("Invalid command: #{cmd_array.join(" ")}") if cmd_array.length < 3
+    cmd = cmd_array.shift
+    path = cmd_array.shift
+
+    # Need to break apart the clause
+    clause_array = parse_commands(cmd_array.shift)[0]
+    verb = clause_array.shift
+
+    #Get the match paths from augeas
+    result = @aug.match(path) || []
+    fail("Error trying to get path '#{path}'") if (result == -1)
+
+    #Get the values of the match paths from augeas
+    values = result.collect{|r| @aug.get(r)}
+
+    case verb
+    when "include"
+      arg = clause_array.shift
+      return_value = values.include?(arg)
+    when "not_include"
+      arg = clause_array.shift
+      return_value = !values.include?(arg)
+    when "=="
+      begin
+        arg = clause_array.shift
+        new_array = eval arg
+        return_value = (values == new_array)
+      rescue
+        fail("Invalid array in command: #{cmd_array.join(" ")}")
+      end
+    when "!="
+      begin
+        arg = clause_array.shift
+        new_array = eval arg
+        return_value = (values != new_array)
+      rescue
+        fail("Invalid array in command: #{cmd_array.join(" ")}")
+      end
+    end
+    !!return_value
+  end
+
   # Used by the need_to_run? method to process match filters. Returns
   # true if there is a match, false if otherwise
   def process_match(cmd_array)
@@ -367,6 +416,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
         begin
           case command
           when "get"; return_value = process_get(cmd_array)
+          when "values"; return_value = process_values(cmd_array)
           when "match"; return_value = process_match(cmd_array)
           end
         rescue StandardError => e

data/lib/puppet/provider/group/directoryservice.rb

@@ -9,4 +9,14 @@ Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider
   confine :operatingsystem => :darwin
   defaultfor :operatingsystem => :darwin
   has_feature :manages_members
+
+  def members_insync?(current, should)
+    return false unless current
+    if current == :absent
+      return should.empty?
+    else
+      return current.sort.uniq == should.sort.uniq
+    end
+  end
+
 end

data/lib/puppet/provider/package/dnf.rb

@@ -0,0 +1,41 @@
+Puppet::Type.type(:package).provide :dnf, :parent => :yum do
+  desc "Support via `dnf`.
+
+  Using this provider's `uninstallable` feature will not remove dependent packages. To
+  remove dependent packages with this provider use the `purgeable` feature, but note this
+  feature is destructive and should be used with the utmost care.
+
+  This provider supports the `install_options` attribute, which allows command-line flags to be passed to dnf.
+  These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
+  or an array where each element is either a string or a hash."
+
+  has_feature :install_options, :versionable, :virtual_packages
+
+  commands :cmd => "dnf", :rpm => "rpm"
+
+  # Note: this confine was borrowed from the Yum provider. The
+  # original purpose (from way back in 2007) was to make sure we
+  # never try to use RPM on a machine without it. We think this
+  # has probably become obsolete with the way `commands` work, so
+  # we should investigate removing it at some point.
+  if command('rpm')
+    confine :true => begin
+      rpm('--version')
+      rescue Puppet::ExecutionFailure
+        false
+      else
+        true
+      end
+  end
+
+  defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => '22'
+
+  # The value to pass to DNF as its error output level.
+  # DNF differs from Yum slightly with regards to error outputting.
+  #
+  # @param None
+  # @return [String]
+  def self.error_level
+    '1'
+  end
+end

data/lib/puppet/provider/package/gem.rb

@@ -111,8 +111,13 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
         # we don't support puppet:// URLs (yet)
         raise Puppet::Error.new("puppet:// URLs are not supported as gem sources")
       else
-        # interpret it as a gem repository
-        command << "--source" << "#{source}" << resource[:name]
+        # check whether it's an absolute file path to help Windows out
+        if Puppet::Util.absolute_path?(source)
+          command << source
+        else
+          # interpret it as a gem repository
+          command << "--source" << "#{source}" << resource[:name]
+        end
       end
     else
       command << "--no-rdoc" << "--no-ri" << resource[:name]

data/lib/puppet/provider/package/rpm.rb

@@ -281,6 +281,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       self::NEVRA_FIELDS.zip(match.captures) { |f, v| hash[f] = v }
       hash[:provider] = self.name
       hash[:ensure] = "#{hash[:version]}-#{hash[:release]}"
+      hash[:ensure].prepend("#{hash[:epoch]}:") if hash[:epoch] != '0'
     else
       Puppet.debug("Failed to match rpm line #{line}")
     end

data/lib/puppet/provider/package/windows/exe_package.rb

@@ -8,7 +8,7 @@ class Puppet::Provider::Package::Windows
     def self.from_registry(name, values)
       if valid?(name, values)
         ExePackage.new(
-          values['DisplayName'],
+          get_display_name(values),
           values['DisplayVersion'],
           values['UninstallString']
         )
@@ -18,13 +18,15 @@ class Puppet::Provider::Package::Windows
     # Is this a valid executable package we should manage?
     def self.valid?(name, values)
       # See http://community.spiceworks.com/how_to/show/2238
-      !!(values['DisplayName'] and values['DisplayName'].length > 0 and
-         values['UninstallString'] and values['UninstallString'].length > 0 and
-         values['WindowsInstaller'] != 1 and # DWORD
-         name !~ /^KB[0-9]{6}/ and
-         values['ParentKeyName'] == nil and
-         values['Security Update'] == nil and
-         values['Update Rollup'] == nil and
+      displayName = get_display_name(values)
+      !!(displayName && displayName.length > 0 &&
+         values['UninstallString'] &&
+         values['UninstallString'].length > 0 &&
+         values['WindowsInstaller'] != 1 && # DWORD
+         name !~ /^KB[0-9]{6}/ &&
+         values['ParentKeyName'] == nil &&
+         values['Security Update'] == nil &&
+         values['Update Rollup'] == nil &&
          values['Hotfix'] == nil)
     end