puppet 4.10.0-x64-mingw32 → 4.10.1-x64-mingw32

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

@@ -1555,6 +1555,22 @@ class PRegexpType < PScalarType
         KEY_VALUE => nil
       })
   end
+
+
+  # Returns a new function that produces a Regexp instance
+  #
+  def self.new_function(_, loader)
+    @new_function ||= Puppet::Functions.create_loaded_function(:new_float, loader) do
+      dispatch :from_string do
+        param 'String', :pattern
+      end
+
+      def from_string(pattern)
+        Regexp.new(pattern)
+      end
+    end
+  end
+
   attr_reader :pattern
 
   def initialize(pattern)

data/lib/puppet/resource.rb

@@ -30,22 +30,19 @@ class Puppet::Resource
   TYPE_NODE  = 'Node'.freeze
   TYPE_SITE  = 'Site'.freeze
 
-  def self.from_data_hash(data, json_deserializer = nil)
+  PCORE_TYPE_KEY = '__pcore_type__'.freeze
+  VALUE_KEY = 'value'.freeze
+
+  def self.from_data_hash(data, rich_data_enabled = false)
     raise ArgumentError, "No resource type provided in serialized data" unless type = data['type']
     raise ArgumentError, "No resource title provided in serialized data" unless title = data['title']
 
     resource = new(type, title)
 
     if params = data['parameters']
-      params.each { |param, value| resource[param] = value }
-    end
-
-    if ext_params = data['ext_parameters']
-      raise Puppet::Error, 'Unable to deserialize non-Data type parameters unless a deserializer is provided' unless json_deserializer
-      reader = json_deserializer.reader
-      ext_params.each do |param, value|
-        reader.re_initialize(value)
-        resource[param] = json_deserializer.read
+      params.each do |param, value|
+        value = convert_rich_data_hash(value, rich_data_enabled) if value.is_a?(Hash) && value.include?(PCORE_TYPE_KEY)
+        resource[param] = value
       end
     end
 
@@ -66,11 +63,35 @@ class Puppet::Resource
     resource
   end
 
+  def self.convert_rich_data_hash(rich_data_hash, rich_data_enabled)
+    if rich_data_enabled
+      value = rich_data_hash[VALUE_KEY]
+      if value.is_a?(Array)
+        json_deserializer ||= Puppet::Pops::Serialization::Deserializer.new(Puppet::Pops::Serialization::JSON::Reader.new([]), nil)
+        reader = json_deserializer.reader
+        reader.re_initialize(value)
+        json_deserializer.read
+      else
+        pcore_type =  Puppet::Pops::Types::TypeParser.singleton.parse(rich_data_hash[PCORE_TYPE_KEY])
+        pcore_type.create(value)
+      end
+    else
+      strict = Puppet[:strict]
+      unless strict == :off
+        msg = _('Unable to deserialize non-Data value for parameter %{param} unless rich data is enabled') % { :param => "#{resource.name}.#{param}" }
+        raise Puppet::Error, msg if strict == :error
+        Puppet.warn(msg)
+      end
+      rich_data_hash
+    end
+  end
+  private_class_method :convert_rich_data_hash
+
   def inspect
     "#{@type}[#{@title}]#{to_hash.inspect}"
   end
 
-  def to_data_hash(json_serializer = nil)
+  def to_data_hash(rich_data_enabled = false)
     data = ([:type, :title, :tags] + ATTRIBUTES).inject({}) do |hash, param|
       next hash unless value = self.send(param)
       hash[param.to_s] = value
@@ -87,7 +108,7 @@ class Puppet::Resource
         value = Puppet::Resource.value_to_pson_data(value)
         if is_json_type?(value)
           params[param] = value
-        elsif json_serializer.nil?
+        elsif !rich_data_enabled
           Puppet.warning("Resource '#{to_s}' contains a #{value.class.name} value. It will be converted to the String '#{value}'")
           params[param] = value
         else
@@ -96,18 +117,35 @@ class Puppet::Resource
       end
     end
 
-    data['parameters'] = params unless params.empty?
     unless ext_params.empty?
-      writer = json_serializer.writer
-      ext_params.each_key do |key|
-        writer.clear_io
-        json_serializer.write(ext_params[key])
-        writer.finish
-        ext_params[key] = writer.to_a
+      tc = Puppet::Pops::Types::TypeCalculator.singleton
+      sc = Puppet::Pops::Types::StringConverter.singleton
+      ext_params.each_pair do |key, value|
+        pcore_type = tc.infer(value)
+
+        # Don't allow unknown runtime types to leak into the catalog
+        raise Puppet::Error, _('No Puppet Type found for %{type_name}') % { :type_name => value.class.name } if pcore_type.is_a?(Puppet::Pops::Types::PRuntimeType)
+
+        if value.is_a?(Hash) || value.is_a?(Array) || value.is_a?(Puppet::Pops::Types::PuppetObject)
+          # Non scalars and Objects are serialized into an array using Pcore
+          json_serializer ||= Puppet::Pops::Serialization::Serializer.new(Puppet::Pops::Serialization::JSON::Writer.new(''), :type_by_reference => true)
+          writer = json_serializer.writer
+          writer.clear_io
+          json_serializer.write(value)
+          writer.finish
+          value = writer.to_a
+        else
+          # Scalar values are stored using their default string representation
+          value = sc.convert(value)
+        end
+        params[key] = {
+          PCORE_TYPE_KEY => pcore_type.name,
+          VALUE_KEY => value
+        }
       end
-      data['ext_parameters'] = ext_params
     end
 
+    data['parameters'] = params unless params.empty?
     data["sensitive_parameters"] = sensitive_parameters unless sensitive_parameters.empty?
 
     data

data/lib/puppet/resource/catalog.rb

@@ -424,15 +424,9 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     end
 
     if resources = data['resources']
-      # TODO: The deserializer needs a loader in order to deserialize types defined using the puppet language.
-      json_deserializer = nil
-      if resources.any? { |res| res.has_key?('ext_parameters') }
-        json_deserializer = Puppet::Pops::Serialization::Deserializer.new(
-            Puppet::Pops::Serialization::JSON::Reader.new([]),
-            Puppet::Pops::Loaders.catalog_loader)
-      end
+      rich_data_enabled = Puppet[:rich_data] || result.environment_instance && result.environment_instance.rich_data?
       result.add_resource(*resources.collect do |res|
-        Puppet::Resource.from_data_hash(res, json_deserializer)
+        Puppet::Resource.from_data_hash(res, rich_data_enabled)
       end)
     end
 
@@ -487,8 +481,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     resources = if @resources.empty?
         []
       elsif environment_instance.rich_data?
-        json_serializer = Puppet::Pops::Serialization::Serializer.new(Puppet::Pops::Serialization::JSON::Writer.new(''))
-        @resources.collect { |v| @resource_table[v].to_data_hash(json_serializer) }
+        @resources.collect { |v| @resource_table[v].to_data_hash(true) }
       else
         @resources.collect { |v| @resource_table[v].to_data_hash }
       end

data/lib/puppet/version.rb

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

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 4.9.4-162-g7637326\n"
+"Project-Id-Version: Puppet automation framework 4.10.0-45-gb0ff2a9\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2017-03-22 13:57-0700\n"
-"PO-Revision-Date: 2017-03-22 13:57-0700\n"
+"POT-Creation-Date: 2017-04-18 09:07-0700\n"
+"PO-Revision-Date: 2017-04-18 09:07-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -19,42 +19,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../lib/puppet/application.rb:353
+msgid "`puppet %{name}` is deprecated and will be removed in a future release."
+msgstr ""
+
+#: ../lib/puppet/defaults.rb:1698
+msgid "Setting 'archive_files' is deprecated. It will be removed in a future release along with the `inspect` command."
+msgstr ""
+
+#: ../lib/puppet/defaults.rb:1707
+msgid "Setting 'archive_file_server' is deprecated. It will be removed in a future release along with the `inspect` command."
+msgstr ""
+
+#: ../lib/puppet/face/help.rb:9
 msgid "Apache 2 license; see COPYING"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:11
 msgid "Display Puppet help."
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:14
 msgid "Display help about Puppet subcommands and their actions."
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:15
 msgid "[<subcommand>] [<action>]"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:16
 msgid "Short help text for the specified subcommand or action."
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:17
 msgid ""
 "      Get help for an action:\n"
 "\n"
 "      $ puppet help\n"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:23
 msgid "VERSION"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:24
 msgid "The version of the subcommand for which to show help."
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:50
 msgid "Puppet help only takes two (optional) arguments: a subcommand and an action"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:59
 msgid "Version only makes sense when a Faces subcommand is given"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:69
 msgid "Legacy subcommands don't take actions"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:81
 msgid ""
 "Could not load help for the application #{applicationname}.\n"
 "Please check the error logs for more information.\n"
@@ -62,6 +86,7 @@ msgid ""
 "Detail: \"#{detail.message}\"\n"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:94
 msgid ""
 "Could not load help for the face #{facename}.\n"
 "Please check the error logs for more information.\n"
@@ -69,23 +94,53 @@ msgid ""
 "Detail: \"#{detail.message}\"\n"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:108
 msgid "\"Unable to load action #{actionname} from #{face}\""
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:150
 msgid " (Deprecated)"
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:153 ../lib/puppet/face/help.rb:174
 msgid "! Subcommand unavailable due to error. Check error logs."
 msgstr ""
 
+#: ../lib/puppet/indirector/file_bucket_file/file.rb:169
+msgid "Unable to verify existing FileBucket backup at '%{path}'."
+msgstr ""
+
+#: ../lib/puppet/indirector/file_bucket_file/file.rb:170
+msgid "Existing backup and new file have different content but same checksum, %{value}. Verify existing backup and remove if incorrect."
+msgstr ""
+
+#: ../lib/puppet/indirector/file_bucket_file/file.rb:176
+msgid "Existing backup does not match its expected sum, %{sum}. Overwriting corrupted backup."
+msgstr ""
+
+#: ../lib/puppet/resource.rb:81
+msgid "Unable to deserialize non-Data value for parameter %{param} unless rich data is enabled"
+msgstr ""
+
+#: ../lib/puppet/resource.rb:127
+msgid "No Puppet Type found for %{type_name}"
+msgstr ""
+
+#: ../lib/puppet/type.rb:1324
+msgid "The `audit` metaparameter is deprecated and will be ignored in a future release."
+msgstr ""
+
+#: ../lib/puppet/util/character_encoding.rb:75
 msgid "%{error}: %{value} is not valid UTF-8 and cannot be transcoded by Puppet."
 msgstr ""
 
 #. TRANSLATORS message accompanied by date of generation
+#: ../lib/puppet/util/reference.rb:17
 msgid "This page autogenerated on "
 msgstr ""
 
 #. TRANSLATORS message accompanied by date of generation
+#: ../lib/puppet/util/reference.rb:116
 msgid ""
 "\n"
 "\n"

data/spec/integration/application/apply_spec.rb

@@ -210,6 +210,7 @@ end
     end
 
     it 'can apply the catalog' do
+      pending('awaits PUP-7423') # test no longer functional when Object types are serialized by reference
       catalog = compile_to_catalog('include mod', node)
 
       Puppet[:environment] = env_name

data/spec/shared_contexts/types_setup.rb

@@ -1,7 +1,7 @@
 shared_context 'types_setup' do
 
   # Do not include the special type Unit in this list
-  def all_types
+  def self.all_types
     [ Puppet::Pops::Types::PAnyType,
       Puppet::Pops::Types::PUndefType,
       Puppet::Pops::Types::PNotUndefType,
@@ -40,8 +40,11 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PBinaryType,
     ]
   end
+  def all_types
+    self.class.all_types
+  end
 
-  def scalar_types
+  def self.scalar_types
     # PVariantType is also scalar, if its types are all Scalar
     [
       Puppet::Pops::Types::PScalarType,
@@ -59,8 +62,11 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PTimestampType,
     ]
   end
+  def scalar_types
+    self.class.scalar_types
+  end
 
-  def numeric_types
+  def self.numeric_types
     # PVariantType is also numeric, if its types are all numeric
     [
       Puppet::Pops::Types::PNumericType,
@@ -68,8 +74,11 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PFloatType,
     ]
   end
+  def numeric_types
+    self.class.numeric_types
+  end
 
-  def string_types
+  def self.string_types
     # PVariantType is also string type, if its types are all compatible
     [
       Puppet::Pops::Types::PStringType,
@@ -77,8 +86,11 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PEnumType,
     ]
   end
+  def string_types
+    self.class.string_types
+  end
 
-  def collection_types
+  def self.collection_types
     # PVariantType is also string type, if its types are all compatible
     [
       Puppet::Pops::Types::PCollectionType,
@@ -88,17 +100,23 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PTupleType,
     ]
   end
+  def collection_types
+    self.class.collection_types
+  end
 
-  def data_compatible_types
+  def self.data_compatible_types
     result = scalar_types
     result << Puppet::Pops::Types::PDataType
-    result << array_t(types::PDataType::DEFAULT)
-    result << types::TypeFactory.hash_of_data
+    result << Puppet::Pops::Types::PArrayType::DATA
+    result << Puppet::Pops::Types::PHashType::DATA
     result << Puppet::Pops::Types::PUndefType
-    result << not_undef_t(types::PDataType.new)
-    result << constrained_tuple_t(range_t(0, nil), types::PDataType::DEFAULT)
+    result << Puppet::Pops::Types::PNotUndefType.new(Puppet::Pops::Types::PDataType::DEFAULT)
+    result << Puppet::Pops::Types::PTupleType.new([Puppet::Pops::Types::PDataType::DEFAULT], Puppet::Pops::Types::PIntegerType.new(0, nil))
     result
   end
+  def data_compatible_types
+    self.class.data_compatible_types
+  end
 
   def type_from_class(c)
     c.is_a?(Class) ? c::DEFAULT : c

data/spec/unit/functions/lookup_spec.rb

@@ -438,6 +438,30 @@ describe "The lookup function" do
       expect(lookup('a')).to eql('value a (from environment)')
     end
 
+    context 'with log-level debug' do
+      before(:each) { Puppet[:log_level] = 'debug' }
+
+      it 'does not report a regular lookup as APL' do
+        expect(lookup('a')).to eql('value a (from environment)')
+        expect(debugs.count { |dbg| dbg =~ /\A\s*Automatic Parameter Lookup of/ }).to eql(0)
+      end
+
+      it 'reports regular lookup as lookup' do
+        expect(lookup('a')).to eql('value a (from environment)')
+        expect(debugs.count { |dbg| dbg =~ /\A\s*Lookup of/ }).to eql(1)
+      end
+
+      it 'does not report APL as lookup' do
+        collect_notices("class mod_a($a) { notice($a) }; include mod_a")
+        expect(debugs.count { |dbg| dbg =~ /\A\s*Lookup of/ }).to eql(0)
+      end
+
+      it 'reports APL as APL' do
+        collect_notices("class mod_a($a) { notice($a) }; include mod_a")
+        expect(debugs.count { |dbg| dbg =~ /\A\s*Automatic Parameter Lookup of/ }).to eql(1)
+      end
+    end
+
     context 'that has no lookup configured' do
       let(:environment_files) do
         {
@@ -2107,6 +2131,53 @@ describe "The lookup function" do
         end
       end
 
+      context 'using deep merge and module values that aliases environment values' do
+        let(:mod_a_files) do
+          {
+            'mod_a' => {
+              'data' => {
+                'common.yaml' => <<-YAML.unindent,
+                  ---
+                  mod_a::hash:
+                    b: value b (from module)
+                  lookup_options:
+                    mod_a::hash:
+                      merge: deep
+                  YAML
+              },
+              'hiera.yaml' => <<-YAML.unindent,
+                ---
+                version: 5
+                hierarchy:
+                  - name: "Common"
+                    path: "common.yaml"
+                  - name: "Other"
+                    path: "other.yaml"
+                YAML
+            }
+          }
+        end
+        let(:env_data) do
+          {
+            'common.yaml' => <<-YAML.unindent
+              a: value a (from environment)
+              mod_a::hash:
+                a: value mod_a::hash.a (from environment)
+                c: '%{alias("a")}'
+              YAML
+          }
+        end
+
+        it 'continues with module lookup after alias is resolved in environment' do
+          expect(lookup('mod_a::hash')).to eql(
+            {
+              'a' => 'value mod_a::hash.a (from environment)',
+              'b' => 'value b (from module)',
+              'c' => 'value a (from environment)'
+            })
+        end
+      end
+
       context 'using a data_hash that reads a yaml file' do
         let(:defaults) {
           {