Merge branch 'puppetlabs:main' into main

Author: buzzdeee

.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |s|
   s.name = "puppet"
-  version = "8.6.0"
+  version = "8.7.0"
   mdata = version.match(/(\d+\.\d+\.\d+)/)
   s.version = mdata ? mdata[1] : version
 

ext/project_data.yaml

@@ -36,7 +36,7 @@ gem_rdoc_options:
 gem_platform_dependencies:
   universal-darwin:
     gem_runtime_dependencies:
-      CFPropertyList: '~> 2.2'
+      CFPropertyList: ['>= 3.0.6', '< 4']
   x86-mingw32:
     gem_runtime_dependencies:
       ffi: '1.15.5'

lib/puppet/info_service/class_information_service.rb

@@ -74,7 +74,7 @@ def extract_param(p)
   def extract_type(structure, p)
     return structure if p.type_expr.nil?
 
-    structure[:type] = typeexpr_to_string(p.type_expr)
+    structure[:type] = typeexpr_to_string(p.name, p.type_expr)
     structure
   end
 
@@ -88,11 +88,10 @@ def extract_default(structure, p)
     structure
   end
 
-  def typeexpr_to_string(type_expr)
+  def typeexpr_to_string(name, type_expr)
     type_parser.interpret_any(type_expr, nil).to_s
-  rescue Puppet::ParseError
-    # type is to complex - contains expressions that are not literal
-    nil
+  rescue Puppet::ParseError => e
+    raise Puppet::Error, "The parameter '$#{name}' is invalid: #{e.message}", e.backtrace
   end
 
   def value_as_literal(value_expr)

lib/puppet/pops/loader/static_loader.rb

@@ -46,9 +46,9 @@ def initialize
 
   def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY)
     # Static loader only contains runtime types
-    return EMPTY_ARRAY unless type == :type && name_authority == name_authority = Pcore::RUNTIME_NAME_AUTHORITY
+    return EMPTY_ARRAY unless type == :type && name_authority == Pcore::RUNTIME_NAME_AUTHORITY
 
-    typed_names = type == :type && name_authority == Pcore::RUNTIME_NAME_AUTHORITY ? @loaded.keys : EMPTY_ARRAY
+    typed_names = @loaded.keys
     block_given? ? typed_names.select { |tn| yield(tn) } : typed_names
   end
 

lib/puppet/pops/validation/validator_factory_4_0.rb

@@ -37,7 +37,7 @@ def severity_producer
     p[Issues::EMPTY_RESOURCE_SPECIALIZATION]  = :ignore
     p[Issues::CLASS_NOT_VIRTUALIZABLE]        = :error
 
-    p[Issues::ILLEGAL_NONLITERAL_PARAMETER_TYPE] = Puppet[:strict] == :off ? :ignore : Puppet[:strict]
+    p[Issues::ILLEGAL_NONLITERAL_PARAMETER_TYPE] = :deprecation
     p
   end
 end

lib/puppet/type/exec.rb

@@ -436,6 +436,14 @@ def check(value)
         back by re-extracting the tarball. If `important.tar` does **not**
         actually contain `myfile`, the exec will keep running every time
         Puppet runs.
+
+        This parameter can also take an array of files and the command will
+        not run if **any** of these files exist. For example:
+
+            creates => ['/tmp/file1', '/tmp/file2'],
+
+        will only run the command if both files don't exist.
+
       EOT
 
       accept_arrays

lib/puppet/util/rpm_compare.rb

@@ -7,7 +7,7 @@ module Puppet::Util::RpmCompare
     armv5tejl armv6l armv7l m68kmint s390 s390x ia64 x86_64 sh3 sh4
   ].freeze
 
-  ARCH_REGEX = Regexp.new(ARCH_LIST.join('|\.'))
+  ARCH_REGEX = Regexp.new(ARCH_LIST.map { |arch| "\\.#{arch}" }.join('|'))
 
   # This is an attempt at implementing RPM's
   # lib/rpmvercmp.c rpmvercmp(a, b) in Ruby.

lib/puppet/util/windows/com.rb

@@ -141,7 +141,7 @@ def initialize(pointer)
 
         self::VTBL.members.each do |name|
           define_method(name) do |*args|
-            if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
+            if Puppet::Util::Windows::COM.FAILED((result = @vtbl[name].call(self, *args)))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end
 
@@ -183,7 +183,7 @@ def initialize(opts = {})
 
         self::VTBL.members.each do |name|
           define_method(name) do |*args|
-            if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
+            if Puppet::Util::Windows::COM.FAILED((result = @vtbl[name].call(self, *args)))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end
 

lib/puppet/version.rb

@@ -8,7 +8,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '8.6.0'
+  PUPPETVERSION = '8.7.0'
 
   ##
   # version is a public API method intended to always provide a fast and

man/man5/puppet.conf.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "March 2024" "Puppet, Inc." "Puppet manual"
+.TH "PUPPETCONF" "5" "April 2024" "Puppet, Inc." "Puppet manual"
 \fBThis page is autogenerated; any changes will get overwritten\fR
 .
 .SH "Configuration settings"
@@ -973,7 +973,7 @@ The time to wait for data to be read from an HTTP connection\. If nothing is rea
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBPuppet/8\.6\.0 Ruby/3\.1\.1\-p18 (x86_64\-linux)\fR
+\fIDefault\fR: \fBPuppet/8\.7\.0 Ruby/3\.1\.1\-p18 (x86_64\-linux)\fR
 .
 .IP "" 0
 .